[automerger skipped] Merge "Fix kotlin nullable errors in SystemUI" into...

[automerger skipped] Merge "Fix kotlin nullable errors in SystemUI" into aosp-main-future am: 3fbb2f79 -s ours am: 28e3d124 -s ours am: 031fd93a -s ours am: cfadd268 -s ours

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739f is already in history

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



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