[automerger skipped] Merge "Add new atom to log userspace reboot performance" am: 2825673781 -s ours
am skip reason: Change-Id Id3f81ced73ea708f1dcfbcfd66f554e8daed8ccc with SHA-1 015b0a43d9 is in history

Change-Id: Ie1afe6a9c5dbee48f4eac8976610cefd3c4ccd31
tree: 685b03b7645f56e32ae89387280494547acabc75
  1. atom_field_options.proto
  2. atoms.proto