Merge "Make KeyguardUpdateMonitor a singleton"