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

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

Change-Id: I957eacc704b8c02e043af875de8232a72287aefd