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

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

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

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



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