[automerger skipped] Merge "Fix SystemUI crash" into tm-dev am: e0d9846e am: a646581a -s ours

am skip reason: Merged-In I20aa6781d46459e0ad3d1321198083f3f9a292f4 with SHA-1 dd65cddd is already in history

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



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