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

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

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