Merge "Merge "Adding resouces for 280dpi" into oreo-cts-dev am: 849aae8b7c" into oreo-mr1-cts-dev