[automerger skipped] Merge "Expose MediaExtractor entry point to MediaMetrics"...

[automerger skipped] Merge "Expose MediaExtractor entry point to MediaMetrics" into rvc-qpr-dev-plus-aosp am: 91869903 -s ours

am skip reason: Change-Id Id10861db464b88734c34c81db945b1a828f0bc2c with SHA-1 0538d6c4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ce18b246d303bebf383e2f20381c0c819e8e2d