[automerger skipped] Merge "Update the SQLite API version table" into udc-dev am: 7fb5f474b4 am: 8d7aae8ab2 -s ours

am skip reason: skipped by user shombert

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24839684

Change-Id: Iac2185f5f2f09998e86f8ed535f8f7e916aeb842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>