[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: ea4bc25e am: 3d8d9728 -s ours am: 1e924802 -s ours am: 3a36a355 -s ours

am skip reason: Change-Id Ia19e8e3a1921ee2609792db50d43b64a12a21f3d with SHA-1 357c8e47 is in history

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

Change-Id: Iaddad1da4f27e826a55e78956d2968b798c3db45