Merge "MediaMetrics: Add thread-safety checking" into rvc-dev am: 718f96b3bb am: 7358b8ac09

Change-Id: Ic6cf69b9f6376a976563702d8c71eb40e3901d13