Merge changes Ie3a96cd8,I67f3a66e am: 58b3822b am: 1f3df22f am: 8cc61462...

Merge changes Ie3a96cd8,I67f3a66e am: 58b3822b am: 1f3df22f am: 8cc61462 am: 30002ca8 am: 9683ceff

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



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