Merge "[ravenwood] Better log redirection to stdout" into main am: d891e96b14

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

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