Merge "Give longer boot timeout when running in CF or goldfish" into main am: 6fe463cab7

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

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