[automerger skipped] Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 am: 5efafd667a am: 131557b166 -s ours

am skip reason: skip tag Change-Id I6bd807ce0df6cd81e44bf89918ac4b7b01c27ae1 with SHA-1 a1245b1c7c is already in history

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

Change-Id: I32efb73124006edc49206b039d74f91068c33ea7