Merge changes I38e6c37b,I674f9079 into main am: 488f64fde2 am: 6327510374

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

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