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
am: 4d8dc78a34  -s ours

Change-Id: I9775f9b0b691008f08292a77dd5e0d7d74bc48bc