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

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

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



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