[automerger skipped] Merge "Merge Android 12L" am: 9f4a8f83c7 -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: Id0b2fa595329838149bb68f23d3614c2ff91b754