Merge "Enable sqlite3 logging in keystore2" am: 0b512f0892

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1798335

Change-Id: I7397ed881d79f14cf82da8ddc13c4e6f9b39de4d