Merge "KeyguardUpdateMonitor: Add missing getFaceAuthInteractor null check" into main