[automerger skipped] Merge RP1A.200720.011 am: d0c7632b0e -s ours am: 7cecbca0d3 -s ours

am skip reason: Change-Id I3d39080c843ada49ab75eb6c2fb4e69b40905356 with SHA-1 dc48840faa is in history

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

Change-Id: I19ea69bb4f79fb73c51d5f8e2ca08edd08d090c5