Merge "Rename the font file with PostScript name based file name" am: 5cc4c3ff91 am: b05555721c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2b8add333b85b30a68ca2287ba76c4316044176