Merge changes I06880640,Ida99e0e5 into main am: a3aadd93 am: 1df493c9

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



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