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

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

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



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