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

Conflicts:
	src/com/android/bluetooth/pan/PanService.java

Change-Id: I9aee09d37221463e85aec0f0f0f2f11f6fb27f24