Merge changes Ia55816f9,I19aec684 am: 6b35cd82 am: 8472ed43 am: 6f7dc763

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



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