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

Change-Id: Id3d22a899b014ca7caf3d4a225452829ae55d0ec