Merge "Use sqlite with no ICU support" am: d467631919

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

Change-Id: Ib38d534a132f3ee69c6c26f4c52f1ccb8133f44f