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

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0ccfa41c am: 53e476db -s ours am: 9d48f26b -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: I34f1d50191634919af3a49cf5555fcd842174bc3