Merge changes from topic "gf-virtconsole-logcat" am: ad22a2adbc am: 3d2e96e844 am: a67aebf772

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1554405

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3efb3cdcd191ed100f471447ec883238e2357439