[automerger skipped] Merge "Merge Android R" am: 582f78f3 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 582f78f3 -s ours am: 7f48ee12 -s ours am: 105684fb -s ours am: da07173c -s ours

am skip reason: Change-Id If51a5ba0ea5f35366841ffb44a10892da68905e4 with SHA-1 5019c313 is in history

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

Change-Id: If0d0e524313397a38f6ffafd61b7919782000736