Merge changes Ic6259fac,Iff3d56fe,I796ded11,I014a2762 into main am: 3a1578f6...

Merge changes Ic6259fac,Iff3d56fe,I796ded11,I014a2762 into main am: 3a1578f6 am: 0f65459d am: 121877d0

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



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