[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: 8c6dff81 -s ours am: ab213bd7 -s ours am: e9aaa4ab -s ours am: ce3df51e -s ours am: 238fcf7f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id712b34954eb9b9e91c432f6effa64d43c0172f8