Merge "Fix NPE in SystemUI" into main am: 548ee3851e am: 284f4ffb1f

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

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