[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: aa3f94ef -s ours

am skip reason: Change-Id I4ec150ed9933c54fe661da15d6b1799087b9d6dd with SHA-1 24da63d1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d5157aa7b2c1cb7f793f82f922f026ca9823db3