[automerger skipped] Merge changes I4b929fed,I0221ab61,If8d6a4e6,I9fa90826,I8eba8517 into sc-dev am: 699978b1 -s ours

am skip reason: Merged-In I4b929fedae1747e63de2aaf236811bb042e0fd57 with SHA-1 46468069 is already in history

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

Change-Id: I9e08a7b411a3c469a8a55e9922f85c0cb403be19