Merge "Fix a systemui crash." into tm-dev am: 71eb3e7e am: 5e752500 am: 641dba29

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



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