[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 1b6030e24c -s ours am: ecb6ede877 -s ours

am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

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

Change-Id: Icb052e904d339089be1b2e0014b7dd16f958e3d6
tree: c3da34b5c25610fdb385857204d33ceb2778f2c6
  1. atom_field_options.proto
  2. atoms.proto