Merge "Fix NullPointException in KeyguardUpdateMonitor" into udc-qpr-dev