Fixes a bug in migration of lock settings to LockSettingsService.

Due to the code to handle backward compatibility, the migration
ended up being recursive.

Change-Id: I1c2cf4a81fbdee6a4b74cafb624625716c88cad3