DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9e3c4fe5406c9913d50fe3b07d7f7cef7a246b96
tree: ebb554f3ebe8d216716810f8d9482a0feb8c36bb
  1. atom_field_options.proto
  2. atoms.proto