[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-0bea8821e463495b89d2f992cae5818d" into rvc-d1-dev-plus-aosp am: 90c7f9c5 -s ours

am skip reason: Change-Id I01c65ce0c60c4f81c408152f5f986e6818150dd1 with SHA-1 295be9c1 is in history

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

Change-Id: Iba54a00890405d509221cd146bc6e2df9f579daf