Merge "Write OS & console logs separately" am: e7f6571421

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1918626

Change-Id: I8d62945cdb8b98c25319c70362726c406f5b31b3