[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into...

[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc49 -s ours am: d5992421 -s ours am: d8f8dbfd -s ours am: eb2361e6 -s ours

am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: I33e54d0cd8b83b842effa774170a43b2439ed76b