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

Merge changes Ic6259fac,Iff3d56fe,I796ded11,I014a2762 into main am: 3a1578f6 am: 316cbcbe am: 9b7e0cc2

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



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