Merge "Use new DevicePolicyManager#logoutUser() methods" into tm-dev