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

[automerger skipped] Merge "Allow MediaMetrics entries from MediaParser" into rvc-qpr-dev am: f99bcdda -s ours am: 133d46a2 -s ours am: 8741eb3b -s ours

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

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

Change-Id: Ifa7a9cc49a0ea0bdf91c6eaa82254cde020b91ec