[automerger skipped] Merge "Add mediametrics enum for MediaExtractor usage"...

[automerger skipped] Merge "Add mediametrics enum for MediaExtractor usage" into rvc-qpr-dev am: 129fb5a9 -s ours am: cb87fecf -s ours

am skip reason: Change-Id I953dd1891ef71dd9d5afbf8e154fdf0a3095d913 with SHA-1 bfe14daf is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00a5ed0edf8a58a632a47a0ffba12b0096ff67fc