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