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

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

Change-Id: I60440ff2849b2ff3117fcf2762a7a6b7dce1b6a2