[automerger skipped] Merge changes Ib9d65164,I074e35ae into tm-qpr-dev am:...

[automerger skipped] Merge changes Ib9d65164,I074e35ae into tm-qpr-dev am: bc4e4763 -s ours am: 0988a007 -s ours

am skip reason: Merged-In Ie58c1bc0d637fc0fabd9797813187d1897c0df51 with SHA-1 03ca4858 is already in history

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



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