Merge "Fix crash in jank monitor debug overlay" into udc-dev am: 4da9107a

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



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