Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a318

Change-Id: Ibc6300b44da27d133ca5649fdc35bce5be9f2935