Merge "Update the database/sql owners" into main am: 8b564ecb2a am: 4c8662f63c

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

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