[automerger skipped] Merge "Merge Android 12L" am: 9f4a8f83 -s ours am:...

[automerger skipped] Merge "Merge Android 12L" am: 9f4a8f83 -s ours am: df0d28ee -s ours am: 9aa60125 -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: I434cbc13f1a475aea49780b0e4f883aa2c9d58f3