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

[automerger skipped] Mark RP1A.200720.001 as merged am: 03a3afda -s ours am: 24b7fe08 -s ours am: 6aa04f4c -s ours

am skip reason: Change-Id I6d013916d33618dab06447fbfd7ee0d9e2d09d7a with SHA-1 847ca751 is in history

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

Change-Id: I298049ac63f0318a84727a82aedf2af91492898d