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

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 56600d5e -s ours am: 6ccd35dd -s ours am: 38d89270 -s ours

am skip reason: Change-Id I6b5bbcb33d827a09bdd6eec24d1add27a4380e24 with SHA-1 5bdaff75 is in history

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

Change-Id: Ibd0fb39d5eaaf089ca34c61e72c386e34e372656