[automerger skipped] Merge Android U (ab/10368041) am: 05f355ed -s ours am:...

[automerger skipped] Merge Android U (ab/10368041) am: 05f355ed -s ours am: 5671261c -s ours am: 71e3fee4 -s ours

am skip reason: Merged-In I681921477939cbf2f0e4476ef545b7faa7fecf82 with SHA-1 7a66c636 is already in history

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



Change-Id: Iaaa02a9d111c0e13319347c802807be6f5981abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>