Merge changes I7af580e7,I16107196 into main am: 8f2dde56

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



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