[automerger skipped] Merge "Allow MediaMetrics entries from MediaParser" into...

[automerger skipped] Merge "Allow MediaMetrics entries from MediaParser" into rvc-qpr-dev-plus-aosp am: c495f782 -s ours am: 8005db47 -s ours

am skip reason: Change-Id Icca73a9396195d8cf299eb03bc778a032aacc364 with SHA-1 0edbb914 is in history

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

Change-Id: I88757c2fc71f47d90125905f18871ef7ea364193