[automerger skipped] Merge "Merge ab/7061308 into stage." into...

[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 67cbb206 -s ours am: e65159a2 -s ours

am skip reason: Change-Id Id38cccf76c45f40c77718a4ec5334e43f59aad54 with SHA-1 5f76910d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa77003b279e3d780dec7eb370a8bd71b9cd4d79