[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: c3d5f01d -s ours

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

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

Change-Id: I92f0b36a0370dc5cce432a31b227e5fefb037ab9