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 am: e016036e

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



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