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