Merge "Merge "Revert "Adding resouces for 280dpi"" into oreo-cts-dev am: abd3a3649d" into oreo-mr1-cts-dev
am: 21ad7a2a0d

Change-Id: I5d154c871fe0fc0a45699b9a9ff00eb728d0fe90