Merge commit '1c40f921' into remote

Conflicts:
	jni/com_android_bluetooth_hfp.cpp
	src/com/android/bluetooth/avrcp/Avrcp.java
	src/com/android/bluetooth/btservice/AdapterService.java
	src/com/android/bluetooth/btservice/RemoteDevices.java
	src/com/android/bluetooth/hfp/HeadsetStateMachine.java
	src/com/android/bluetooth/map/BluetoothMapContentObserver.java
	src/com/android/bluetooth/map/BluetoothMapService.java
	src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
	src/com/android/bluetooth/pan/PanService.java
	src/com/android/bluetooth/pbap/BluetoothPbapReceiver.java

Change-Id: I41068ac7787983519220fe6fee1e65ff66298db1