[automerger skipped] Merge changes I52f671e7,I5ca3acb8 into tm-qpr-dev am:...

[automerger skipped] Merge changes I52f671e7,I5ca3acb8 into tm-qpr-dev am: fdeea5ab -s ours am: 38167367 -s ours

am skip reason: Merged-In I52f671e7fa39f91cc562de2501c5d68665e5b4c8 with SHA-1 f125a890 is already in history

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



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