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

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

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