Merge "Merge "define media.metrics events for statsd" into qt-dev am: b5e2988558" into qt-dev-plus-aosp
am: c0c645fa13

Change-Id: I995694b54c5ae23f6c5cd9c53852db5502cda88a