Merge changes I080c7fa0,I006d5762 am: 76119858

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



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