Merge "Fix KeyguardUpdateMonitor auth lifecycle issues" into sc-dev