[automerger skipped] Fix for sqlite3_open_v2 returning errors. am: 04524550f0 -s ours am: 8633578350 -s ours am: 4e4580bf3c -s ours

am skip reason: Change-Id I9e02a810bee088b35d25921086810f695956d6d3 with SHA-1 04524550f0 is in history

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

Change-Id: I587199d6d9a969eb42422120c4961ce1e6a2e6e3