Merge "Fix ViewTest that fails on ldpi devices." into oreo-mr1-cts-dev