[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: e7bea4b9 -s ours am: 05b1a2b2 -s ours am: dde4a353 -s ours am: f2cf95d5 -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: I7eee0362a9aae88625797926ce4a48aee92f31b2