Merge "Require permission to unlock keyguard" into udc-dev