[automerger skipped] Merge Android 12L am: 1ec78d0f -s ours am: 8547ccd4...

[automerger skipped] Merge Android 12L am: 1ec78d0f -s ours am: 8547ccd4 -s ours am: fd92b4c0 -s ours

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

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

Change-Id: Ic7d2d22d8a898a23d1b5b8c40f416997dc414198