Merge "DevicePolicyManager Authentication for Lock Task"