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

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

am skip reason: Change-Id If51ee018da3056231910cd9c18f1b938a5c0e343 with SHA-1 9ca23a48 is in history

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

Change-Id: Ibb1385c80ca0a3a244da0c3dc5202569c4d5263c