Fix locksettings state removal on user removal

http://ag/19542373 (commit 78e245a2) made locksettings state removal
happen later during user removal than it did before.  Unfortunately,
this made it stop working properly, since by the time it runs, the
/data/system_de/$userId/spblob/ directory has been locked by
StorageManager.destroyUserKey().  As a result, resources used by
synthetic password protectors, e.g. Weaver slots, stopped being freed.

Fix this by cleaning up the lock settings state *before* destroying the
user keys.

Bug: 232452368
Bug: 253631183
Test: 'pm create-user 10 && pm remove-user 10', then checked log to
      verify that the Weaver slot was removed.
Change-Id: Ib3e7586bfde37632b77c7655bc91692ee6daad86