Merge changes Icc51642d,I0baca864 am: 5f34abe565

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

Change-Id: I6711f64da3e9504c9a388dffbafa9475b2ef190d