Merge changes I975b53e8,I75e39ce4,Iabaae7c4,I9b26b6e1 am: bb1903cc46 am: 4b7bc00014

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

Change-Id: I1dfe3f6700f50b03e54d78b7cbe90271ba8823d2