Merge changes I74548185,I7cbdc8b8 am: e6845aef am: bf820592 am: 02fa7023...

Merge changes I74548185,I7cbdc8b8 am: e6845aef am: bf820592 am: 02fa7023 am: a509e45f am: b019a136

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



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