Merge "Stop LockSettingsService from calling DevicePolicyManager directly"