Merge changes from topic "revert-3004403-VVMMIOBWAB" into main am: d11514d85b am: c64902c1fd

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

Change-Id: I396347dc1215f58eb0c602e4bc6cae3530c7a992
Signed-off-by: Automerger Merge Worker <[email protected]>