[automerger skipped] Merge "Merge Android R" am: ea2e7362 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: ea2e7362 -s ours am: a90d89be -s ours am: 0b44dcee -s ours am: 14d6d7f5 -s ours am: 30a866fd -s ours

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

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

Change-Id: I7afb166123bab09cb570182b668e5a7fb39491cf