[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: e53652d8 -s ours am: 1e414ec7 -s ours

am skip reason: Change-Id I2124715be3f6156a02960f733dc7dd7a1d6f1899 with SHA-1 21089206 is in history

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

Change-Id: I3cb9b78f72adbcd651c521c2285b0707b4f3e0e6