[automerger skipped] Merge RP1A.200720.011 am: d0c7632b -s ours am:...

[automerger skipped] Merge RP1A.200720.011 am: d0c7632b -s ours am: 7cecbca0 -s ours am: 1b2c3570 -s ours am: 79de37b7 -s ours

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

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

Change-Id: Ib3c5bb63dbb46936d684bc5b2c3e52907b991308