Merge changes Iabe58600,Ie1f2c0dd am: 2e97a8c7 am: ed9030ed am: 26b8dde6...

Merge changes Iabe58600,Ie1f2c0dd am: 2e97a8c7 am: ed9030ed am: 26b8dde6 am: 862223d8 am: 8ac4c29f

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



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