[automerger skipped] Merge changes I75c98beb,I17a6cf6d,I2f152493 into...

[automerger skipped] Merge changes I75c98beb,I17a6cf6d,I2f152493 into tm-qpr-dev am: a09a63b9 -s ours

am skip reason: Merged-In I75c98bebfc270a40801efa8cea1788f30fe728e2 with SHA-1 fa4219a1 is already in history

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



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