Merge changes from topic "libchrome-r1093705" am: 0645c96b am: 78a860e0 am: f3694bda

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



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