Merge "Merge "Adding correct resources for 280DPI." into oreo-cts-dev am: cf47108a0f" into oreo-mr1-cts-dev
am: cc6cb68e98

Change-Id: I2284748fe92fdf17993af143212d798aea2d4f8e