[automerger skipped] DO NOT MERGE Fix CVE-2020-15358 and CVE-2020-13871 am: 201685e798 am: b09acf208a -s ours am: 292577d5f5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/15261414 Change-Id: Ib669d6588eaa9f5a7913436b7127f17af092e055