[automerger skipped] Merge "Merge Android R...

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 0932139b -s ours am: e6170c41 -s ours

am skip reason: Change-Id I6b5bbcb33d827a09bdd6eec24d1add27a4380e24 with SHA-1 85ddcbc1 is in history

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

Change-Id: I620641da74a7d93962ee3181e9c15bbad579367d