Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/apps/Bluetooth into HEAD

Android 6.0.1 release 3

Change-Id: I3be439472d2eb426c5624267426bb7bb7bcbbf82
8 files changed