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

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



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