[automerger skipped] Merge changes Ie911ba61,I1d019bfd into tm-qpr-dev am:...

[automerger skipped] Merge changes Ie911ba61,I1d019bfd into tm-qpr-dev am: f5b262f2 -s ours am: 2a934d00 -s ours

am skip reason: Merged-In Ie911ba613aa36978f728e591611be5fe516404e1 with SHA-1 4b9ba05c is already in history

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



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