[automerger skipped] Merge "Update fontchain_linter for non-compat font" into...

[automerger skipped] Merge "Update fontchain_linter for non-compat font" into tm-qpr-dev am: 73420439 am: 91a017b9 -s ours

am skip reason: Merged-In If60de61504188a7222e2efa67705b8bf4400dbda with SHA-1 e7e383e0 is already in history

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



Change-Id: Iaaa04d4e93bdf9b25aaa60dcd3f28ce66acb258e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>