Merge changes I9f8ce2e5,I3142b073 into rvc-dev am: 084e7473fb am: 371fd5474d am: fd84736da4 am: ac48de65c2

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

Change-Id: Idb627109f194974e20753697b4d24310780161bf
tree: d0ab0c60859fa8c8ef066f9fe17794068b3d2cc7
  1. atom_field_options.proto
  2. atoms.proto