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

Change-Id: Icd718c2eb9b33382f73309738d65a24bb9f92b0b