Merge "Blur media.metrics timestamps for privacy" into oc-mr1-dev am: ac18a847a4
am: 2e2fb65509

Change-Id: Iec2e7cff838593fc72cf19baaade50e0d01c4d62