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

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

Change-Id: I1a4123db3448638bee3b2d0978bba738e977a715