Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev