[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 9833a0fd -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: I0b747bc8748b11081bb13d9bf16b05addc6760f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>