Revert "RESTRICT AUTOMERGE: Manually merge c27452a66662518cd827eca6ea2227d40cb41d19 to aosp-master"

This reverts commit 9129b80dc7882a14c243aabe89eac72d003df4ee.

Reason for revert: mistakenly used "RESTRICT AUTOMERGE" on the title.

Change-Id: I7ec9917887763912114405ba89eb5f0fac328d97
1 file changed
tree: fae9a03360a41cd6aeac47459d278f86389aee07
  1. atom_field_options.proto
  2. atoms.proto