Merge "Fix NullPointException in KeyguardUpdateMonitor" into main