Merge "Fix a systemui crash." into tm-dev am: 71eb3e7e am: a0c70d54

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



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