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

Change-Id: I93e1b060e6f93826ef9fe8e237d394c344e302a9