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

am skip reason: Change-Id Id10861db464b88734c34c81db945b1a828f0bc2c with SHA-1 6b6699abe5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44938b17271a68fa2e8061aaa55b487b45129cbf