[automerger skipped] Merge "Expose MediaExtractor entry point to MediaMetrics" into rvc-qpr-dev am: 84396160e4 -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/+/13217195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79c1be62169c5372fed805627635856a411023c4