[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 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: Ib2cc9a24c7656e6ed7e3ee15c8fe6233287e502a