[automerger skipped] Merge "Merge RP1A.200720.011" into stage-aosp-master am:...

[automerger skipped] Merge "Merge RP1A.200720.011" into stage-aosp-master am: d980be6f -s ours am: ec7c37e2 -s ours

am skip reason: Change-Id I422be3cef5aee3990c81a6de6e2ae783a92a7fc3 with SHA-1 6ccd35dd is in history

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

Change-Id: I6d11d4434f4325dda72615de655769172cb4069c