[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: f6fcb55c1a -s ours am: 8667df4d71 -s ours am: 4d9bc16ce1 -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: I33e54d0cd8b83b842effa774170a43b2439ed76b
tree: b24d06c21b2e5e6efb5fbfcba0b3164cdbb3d047
  1. atom_field_options.proto
  2. atoms.proto