Merge changes Ica667d0d,I126ef61a am: b70bf1bf am: d35b6a9d am: c5767f2b...

Merge changes Ica667d0d,I126ef61a am: b70bf1bf am: d35b6a9d am: c5767f2b am: 5409579a am: 8d315aef

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



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