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

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

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



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