[automerger skipped] Merge "Merge Android R" am: ea2e736293 -s ours am: a90d89be09 -s ours

am skip reason: Change-Id I2e910257538c52e37e67ca9fe884daa80219415b with SHA-1 d0c7632b0e is in history

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

Change-Id: I7c3568a2eaaa69d007fcb90d0190350db717f848