[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am:...

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

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

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

Change-Id: I1eaaa6fc24282b7766d15e885534337d7e726ff0