Merge "Enable write-ahead logging for keystore db." am: fb1604952a am: 91fe6ad84b am: 4f27ac568a

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

Change-Id: Ie6bade3ae98f0d15bab788e9d3e41668d6d71da3