[automerger skipped] Merge Android 12L am: 1ec78d0ff8 -s ours am: 8547ccd409 -s ours am: fd92b4c05e -s ours am: 6f34163100 -s ours

am skip reason: Merged-In If897887ccd8a36028e979c0e88b6f617b5c5b91f with SHA-1 79b591ded3 is already in history

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

Change-Id: I82b7fbfb8b6c79794fa2ad9c63bbacf63ff8f50c