Merge "MediaMetrics: Enable proto upload to statsd am: a0a5ad220b am: 6b0900e50a am: 87f51b3def" into rvc-qpr-dev-plus-aosp