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

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

Change-Id: If5b881928db8bb75dcba85df6985358e4f632663