Merge "Remove the database_loop_timeout flag" into main am: 2214285877 am: 4144e22c3f

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

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