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

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



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