[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: c83da3c0 -s ours

am skip reason: Merged-In I36fe03dd16dc5a88b85f9e71f973aa148e28e044 with SHA-1 bb83bd4d is already in history

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

Change-Id: I4cda4b6d236e09bf65fd77b4f2d7157bd7fe8db5