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

Change-Id: Ic78c146bd45b5dc2725a1920a35fd34dcf488d1f