Merge "Add privileged APIs to lock device and reset device password"