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

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

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



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