Merge changes from topic "am-6e6c05bda62741d8a09fc4713c93087a"

* changes:
  [automerger skipped] Merge "Add mediametrics enum for MediaExtractor usage" into rvc-qpr-dev am: 129fb5a990 -s ours am: cb87fecf15 -s ours
  [automerger skipped] Merge "Expose MediaExtractor entry point to MediaMetrics" into rvc-qpr-dev am: 84396160e4 -s ours am: f6230e890a -s ours