Merge changes I5258f845,I89b188d8 into main am: 48dda7c7 am: d64b8e8c

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



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