[automerger skipped] Merge "Allow MediaMetrics entries from MediaParser" into rvc-qpr-dev am: f99bcdda48 -s ours am: 133d46a2bd -s ours

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

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

Change-Id: If90337b54ceca4bdbdc104e6d6828fff3c3c9d76