[automerger skipped] Mark RP1A.200720.001 as merged am: 2f0cb47d -s ours am:...

[automerger skipped] Mark RP1A.200720.001 as merged am: 2f0cb47d -s ours am: 59cc3f91 -s ours am: 8a8fc4f6 -s ours

am skip reason: Change-Id I0dd43371be167774311d93d061a72cd35508b734 with SHA-1 6286b43d is in history

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

Change-Id: I925231517eaa5437a9357b1b194de5220a209659