Merge "Do not disclose the database name in sqlite logs" into main am: 8d6e82979e am: 38c867662d

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

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