Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/packages/apps/Bluetooth into aosp-7.1

Android 7.1.0 release 4

Change-Id: I44595dac56b16a9b3c24a9d0c3afdc69abae5f92
31 files changed