[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: 101ddd7b -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: I3c9a9a27e5947096139d48c951f0669984674ddd