Merge "bug:3443154 fix database tests after disabling sqlite wal"