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

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

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