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

am skip reason: Change-Id I9e02a810bee088b35d25921086810f695956d6d3 with SHA-1 074db7db3e is in history

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

Change-Id: I43f058ccc394bba30d45d77fae8732fe1a2ab0c0