[automerger skipped] Merge "Merge Android 12" am: 4da69c29 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 4da69c29 -s ours am: 3acfa910 -s ours am: 964bca09 -s ours am: 53829915 -s ours am: 88b75441 -s ours

am skip reason: Merged-In I6b0f39925e8e65e183629522146d4338ea0f5aeb with SHA-1 43ae5a81 is already in history

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

Change-Id: I34b7d9c2a6264bdb4fd2072f55413a78f3fe90f3