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

Change-Id: I266fd0241def6c2a26380b163d87da18f2735501