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

[automerger skipped] Mark RP1A.200720.001 as merged am: b22595a8 -s ours am: 6323ce1d -s ours am: 61d91b56 -s ours

am skip reason: Change-Id I6f4e173192db664d5d1462179b5b44b821596674 with SHA-1 288133d9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12514225

Change-Id: I450cbf52cddb9547c0e0669c7f6c7839329bf50a