[automerger skipped] Merge changes I4305dc64,Ib4454b8c into tm-qpr-dev am:...

[automerger skipped] Merge changes I4305dc64,Ib4454b8c into tm-qpr-dev am: 16f28028 -s ours am: 9f74dfc4 -s ours

am skip reason: Merged-In I4305dc64c04bedb904d5e23ef29f5282a27a2860 with SHA-1 f609a972 is already in history

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



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