Merge changes Ic8fb3193,Ied7a7552 am: a45ed88d am: 1f9f5d53 am: 028d7f76...

Merge changes Ic8fb3193,Ied7a7552 am: a45ed88d am: 1f9f5d53 am: 028d7f76 am: 4a0b6668 am: eaed76b2

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



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