Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a3 am: 4aea18e7 am: 7f251ff5 Change-Id: I14cbefc08ad6801945a6b46005c11e52f9593b42