[automerger skipped] Mark RP1A.200720.001 as merged am: 8aa7c0a5 -s ours am:...

[automerger skipped] Mark RP1A.200720.001 as merged am: 8aa7c0a5 -s ours am: 9a1e6e1f -s ours am: 308d6b05 -s ours

am skip reason: Change-Id I0dd43371be167774311d93d061a72cd35508b734 with SHA-1 2d68ce1e is in history

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

Change-Id: I925231517eaa5437a9357b1b194de5220a209659