[automerger skipped] Merge "Add MediaMetrics support to MediaParser" into mainline-prod am: fd3f41c4b7 -s ours

am skip reason: Change-Id If51ee018da3056231910cd9c18f1b938a5c0e343 with SHA-1 4d78955882 is in history

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

Change-Id: Ie901400c4d094d5b2cb963192d1c52a8f694cf51
tree: 456d9f983884bbd46b91f54154a8763963cbfcee
  1. atom_field_options.proto
  2. atoms.proto