Merge "Revert "Adding resouces for 280dpi"" into oreo-cts-dev am: abd3a3649d
am: 8dada5da88

Change-Id: I68cda816fde2fc89643366b862b40c6d9e64d980