[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 81f6c870 -s ours am: 5579892b -s ours

am skip reason: Change-Id I3d900f29ab1bd0cddcebb1c1561151efe2bbcd3a with SHA-1 105684fb is in history

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

Change-Id: I87d78eb2c6216bad4730b907d0da3ad825406969