Merge "Remove unnecessary flag check from RecoverableKeystoreDb." into udc-dev am: 76e2a5a1 am: 9a545791 am: b02435ef

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



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