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: Iaa14b70a2c909d38e5752607e7e1be24b53a8bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>