Merge "Retrieve terminal info in a more robust way" into main am: 1404315bb8

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

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