Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	src/com/android/bluetooth/btservice/QAdapterProperties.java
	src/com/android/bluetooth/btservice/QAdapterService.java
	src/com/android/bluetooth/btservice/QJniCallbacks.java

Change-Id: I263a21a49cfd3ce30f17fd46d948f2271ff4d47d