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

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 03c85416 am: 1d243136 -s ours

am skip reason: Change-Id Ia19e8e3a1921ee2609792db50d43b64a12a21f3d with SHA-1 5d426be6 is in history

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

Change-Id: I3a77a7ce60ea3adb2c0f1138ac5b9a39ba9a1760