[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 8fccc98c -s ours am: dc48840f -s ours am: 6e01a8a3 -s ours

am skip reason: Change-Id I43f058ccc394bba30d45d77fae8732fe1a2ab0c0 with SHA-1 86335783 is in history

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

Change-Id: Iac68f0509733478b169e98b9eb69ab4c9e47d803