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

Change-Id: Ic4f2a05791a9ae375bc0acb220c48e78f7d6cea1