Merge "MediaMetrics: Enable proto upload to statsd am: a0a5ad22 am: 6b0900e5 am: 87f51b3d" into rvc-qpr-dev-plus-aosp am: ff1c3cc6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11851233

Change-Id: I7727b06c6cb5c4a210ccb913d5c026d8555d4afd