Merge changes I4ac830a6,I85af7a69 am: 3deda653 am: f36ac289 am: 28b78939 am: c64feaa5 am: 681ecedb am: 0407ef40

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2573539



Change-Id: Ic8c68ede416b931501950168138836918d203e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>