Merge "DO NOT MERGE Adding support for hdpi 240dp" into oreo-cts-dev