[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 984f0556ad -s ours

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

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

Change-Id: Ibe18c1e4bb2fffb65add10a48b8a72fde60a2e2b
tree: 994f971a7a14401a01a5f09676637d116e3c0ff8
  1. framework/
  2. OsuLogin/
  3. OWNERS