Merge "Fix SysUI NPE crash during the boot/init progress" into sc-dev am:...

Merge "Fix SysUI NPE crash during the boot/init progress" into sc-dev am: 2adcf768 am: b87a8e27 am: 3bb1f628

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

Change-Id: Idb76faac32c4433cb1d306871a0e4eca2318d264