Merge "Watchdog: add media.metrics" am: 6cb33a1b54
am: 701c4cd1cc

Change-Id: If5fb8cfe18e7fad089b5aec8e3168dab940826ec