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

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

Change-Id: I85d086c777a9c9cf0a3d1a33f1905b46d68fbccc