[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master...

[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: e7bea4b9 -s ours

am skip reason: Change-Id I567c7e25a01a506661580b271374228bacb4d110 with SHA-1 7a0cbc4b is in history

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

Change-Id: I9d145b3eee3b6a073f41d1e876449839288ecfeb