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

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

Change-Id: I9d78183cbd3eca3905633dff13a889027a301971