Merge "Adding correct  280DPI with font 1.0" into oreo-cts-dev am: d1cc1c0a9a am: a80de09c16 am: cf60182bf9
am: ba1ad43d74

Change-Id: Ifae3bca46f07f06111e2397a8008389dce9d2ad3