Merge changes I89c9c96d,I9c7b68d5,I6b3f2b0c am: 8c5e23c396

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

Change-Id: Ia94cbe02a133fbbfb0ecbb5a51759fc3568b5f0b