[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT...

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

am skip reason: Merged-In If44b7cf697ce3d73c2e65639ab404a364e7a5672 with SHA-1 afa5a0d0 is already in history

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

Change-Id: I37fb31497551584c01c7c5c0e7f707b5162fe8a7