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

[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 1cfa27bf -s ours am: 1242c7a8 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f7c041486241257813f612c69dfe9a0e4eaa355