Fix CVE-2020-15358 and CVE-2020-13871 am: 84500124e6 am: bc29bf9026

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

Change-Id: Ib54c1fc2b4fbfc82080603313681eae061a12b1d