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

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



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