[automerger skipped] Merge changes Ied008f0c,Ia52234b4 into tm-qpr-dev am:...

[automerger skipped] Merge changes Ied008f0c,Ia52234b4 into tm-qpr-dev am: 1994ee52 -s ours am: 2f41c70b -s ours

am skip reason: Merged-In Ied008f0c79d95861132314fa9a4f69a5ac63e1c5 with SHA-1 cc2f4847 is already in history

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



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