Merge changes I8c1922b2,Ie8c35ba5,I2c7a2738,I03d22725,I89faef9f into main am:...

Merge changes I8c1922b2,Ie8c35ba5,I2c7a2738,I03d22725,I89faef9f into main am: e976df30 am: 81e15edb

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



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