Merge changes Iabe05522,I7f873542 am: 7b1d3570 am: ce077032 am: 19f88e0d...

Merge changes Iabe05522,I7f873542 am: 7b1d3570 am: ce077032 am: 19f88e0d am: 8f8412a8 am: 6d31cfef

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



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