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: cefaa3b2

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



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