Merge "dumpstate: add media.metrics"
am: 372362556f

Change-Id: I2aca9eb6d4fa06285926e428099352859ca94574