[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 9833a0fd -s ours am: e2b1046a -s ours

am skip reason: Merged-In I12ba3010c324ce784a1bc1ab2f422575490761a1 with SHA-1 55cfff04 is already in history

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



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