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 am: 4ed21111

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



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