[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: ba998c97 -s ours am: a0af340f -s ours

am skip reason: Change-Id Ib07b6c0101dd9e081454a420c2853d9fa47d97aa with SHA-1 e0cf3334 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib423a3fa3209206426c685acc19a9a58e446ed72