Merge "dumpstate: add media.metrics" am: 372362556f am: 8fb5d8939b
am: 9182f83543

Change-Id: I326c12a102a28139eb16624ce2510081bf7fcc60