[automerger skipped] Merge "Merge Android R" am: 4491d9e3 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 4491d9e3 -s ours am: d56dd25f -s ours am: d636a957 -s ours am: b81fa1d4 -s ours

am skip reason: Change-Id If51a5ba0ea5f35366841ffb44a10892da68905e4 with SHA-1 5ce9144c is in history

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

Change-Id: If0d0e524313397a38f6ffafd61b7919782000736