Merge changes If0a0f7b1,I2b94a368 into main am: 8b0b7decf4 am: efb367e9cf

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

Change-Id: Ibfe10908733c8a84399312139b00b14d9ee64933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>