[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 37a11779 -s ours am: d62b7b64 -s ours

am skip reason: Change-Id Ic679a38e6311058f96e1ec4e58ce2645575fabe6 with SHA-1 3e16307e is in history

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

Change-Id: Iffd5c9e5f50654860f699fcc15813ce8c579f21c