Merge "Don't pass useless journal_mode in URI" into main am: b91c193575

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

Change-Id: Icda7b7a5fdd30d50d3d6d2e2dd4c1723468ec355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>