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

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

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

Change-Id: Ib844af864deac0faad758adc1d0a72b04cbc19e9