Merge "Give up on busy DB after a while" into main am: 99464340c4

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3041776

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