Merge "Allow redirecting log to console" into main am: c6faa6b979 am: 5ea4fb7703

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

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