Merge "Move LockSettingsService into locksettings package."