Merge "Send Keystore2 logs to SYSTEM rather than MAIN" am: f2a147a6be

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

Change-Id: I6c275a08c980f62f7e16fd95f9e1a0265762d124