[automerger skipped] Merge "Merge RQ2A.210305.007" am: 76744394 -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 76744394 -s ours am: effd0e11 -s ours am: a6052238 -s ours

am skip reason: Change-Id Id199e90a84cad61f67f482771f2ae4163edb8681 with SHA-1 6213623b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If544aa88f803a6a745f726d1e3ed2c27fe515698