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
am: 6ae86440ff  -s ours

Change-Id: I791bc3cc8e3549b5ce097db4aacf20c71ece0e9f