Merge "PaintMeasureTextTest: only pause/resume not_cached benchmarks" into oc-mr1-dev am: f523fe4fa7
am: 2f2cad50d5

Change-Id: Ic27001d02c252bbddc8d4778290b1d542dd9d374