[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT...

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1147f809872221ac02c17141f90494f2846ac50