Merge "Fix test so that it works with ldpi densities" into oreo-mr1-cts-dev