Merge "Merge "Adding correct  280DPI with font 1.0" into oreo-cts-dev am: d1cc1c0a9a" into oreo-mr1-cts-dev
am: 6cde69cf67

Change-Id: I6d0982aeb01f3dfb4cd42ca5d546c566c7528906