Merge "Minor tweaks to the sqlite upgrade script" into main am: 92580f90a6

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

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