Merge "Added an onDeviceUnlockLockout callback to TrustAgentService."