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: 450cb4ee am: 0823832e am: 3d73d6b3

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



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