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

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

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