Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 am: 5efafd667a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

Change-Id: I91da6f7fb815ac46479dd6d5b02451959cdf5f19