Move more file handling into LockSettingsStorage

Strengthens the guarantee of only one kind of lock type existing at one
time by clearing all of the relevant files out closer to time of write.

Change-Id: I141103dab5d7d4bc80b05a22b8566326d1c9e7e1