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

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



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