[automerger skipped] DO NOT MERGE Fix CVE-2020-15358 and CVE-2020-13871 am:...

[automerger skipped] DO NOT MERGE Fix CVE-2020-15358 and CVE-2020-13871 am: 201685e7 am: b09acf20 -s ours am: 292577d5 -s ours am: cc0e3fbc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1f0ca784f1b18c0cac9e2d6b31a19a7280d7916d