Merge "Update KeyguardUpdateMonitorTest" into udc-dev