Recreate recoverablekeystore database if upgrade fails.

Ignore error during v6-> v7 update since the table was modified on some
devices without version change.

Bug: 274760375
Bug: 274722066
Test: atest com.android.server.locksettings.recoverablekeystore
Change-Id: I8cdb7aaa1f10791fc6c23a6a26ff9e9cba0ae0f1
2 files changed