[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 0266d17604 -s ours am: 97688225bb -s ours

am skip reason: Merged-In Ieed9b5be46c459587a8ae198185a13640d17bd03 with SHA-1 22640e229b is already in history

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

Change-Id: I5147871e2ffa048c96c2ad295bad30a203b3c90e