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

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 79b591de -s ours am: 3e59e596 -s ours

am skip reason: Merged-In Id8bfe752f70d990aa6cd5a4c121a2cc0541063b5 with SHA-1 df8b8a8d is already in history

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

Change-Id: I219ae19bcf704337ad2fb158200aa5b984e93f31