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