Merge "Recreate recoverablekeystore database if upgrade fails." into udc-dev am: d5c227a7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22206794



Change-Id: I7d8fd7ddcd2b442d31b7af8e9210664c7c329d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>