[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: f608cc3e -s ours am: 0ff2bca3 -s ours am: d59a2689 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia1d460c82dbf46065d563adc78fb0734130a87f6