[automerger skipped] Merge "Add MediaMetrics support to MediaParser" into...

[automerger skipped] Merge "Add MediaMetrics support to MediaParser" into rvc-qpr-dev-plus-aosp am: bc5fb0e1 -s ours

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

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

Change-Id: I499d1918383538e5fd69c0c9c6ea44e8e336f418