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

Merge "Merge "Fix a systemui crash." into tm-dev am: 71eb3e7e am: 5e752500" into tm-d1-dev-plus-aosp am: 53f98c88

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



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