Merge "Set write-ahead logging once at boot" am: 14e670db60 am: e42690612f

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

Change-Id: I2be23124b1f1ebe7a42a6a0e9095873eebd83d4f