Merge changes I677dff58,I5748fbbb,I7803be1e am: c7a69b25a6

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

Change-Id: Ie8cb815ae145dbca57e2aa4b4373576b1d1535eb