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

Change-Id: I9112f2c774778cfca9ddba372ebc6c123730e8af