Merge "MediaMetrics: Add typed property keys" into rvc-dev am: cead18a3 am: 4aea18e7 am: 38858b47 am: 10265da0 Change-Id: I3acc697d1111686b95131e25d3d28bcb887c0671