Merge changes Ide1006b0,I03eb0c6a into main am: e02d711e

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



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