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

Change-Id: I8529957b0e8bd7cc6d2ea97ec13795bd32f9f969