Merge "[Debug][Font] We need know which font leads to system_server crash."...

Merge "[Debug][Font] We need know which font leads to system_server crash." am: a8868560 am: 5bee7363 am: 8394aa23 am: c723ca34

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



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