Merge "Revert "Enable write-ahead logging for keystore db."" am: 407feb7f61 am: 5aa616769e

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

Change-Id: I343ddc1094a497dd2517f47b8faf8f4ceac0f71a