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

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

Change-Id: Ib21f9a41002b64cee08d733bdbe4d0a53dcdfdc4