Merge "MediaMetrics: Fix clang-tidy warnings" into rvc-dev am: fd27c52392 am: dc8fe25bbe am: 19a5849e24 am: 787bd20be9

Change-Id: I603a200a1909cc24d136fa41c667cfb5795f3aa9