Merge changes If0a0f7b1,I2b94a368 into main am: 8b0b7decf4 Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/3502192 Change-Id: I05279e4f01e4bfcc94c1f1ae85219572fe84e7f0 Signed-off-by: Automerger Merge Worker <[email protected]>