[automerger skipped] Merge "Add libsqlite_static_noicu" am: 6ca69146 -s ours...

[automerger skipped] Merge "Add libsqlite_static_noicu" am: 6ca69146 -s ours am: 43ae5a81 -s ours am: 2eef07e5 -s ours

am skip reason: Merged-In Id8bfe752f70d990aa6cd5a4c121a2cc0541063b5 with SHA-1 df8b8a8d is already in history

Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/1824537

Change-Id: I510a187894f4989774b85d052a475d6dc1852072