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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cf6bb2809fe8229f0ed7435327d5a2f629b9311