Merge remote-tracking branch 'caf/kk_rb1.11' into HEAD

Conflicts:
	src/com/android/bluetooth/hfp/AtPhonebook.java

Change-Id: Iaf15a18d91c455cd0b89aca3755dea7b600ad897