Merge "[automerger skipped] Merge "DO NOT MERGE Adding support for hdpi 240dp" into oreo-cts-dev am: 953fb8957d  -s ours" into oreo-mr1-cts-dev