Merge changes I9b387da8,Iabeca8c4 am: 2c770e73a7

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

Change-Id: I7200da91d03bc3d0fbeaa4aa27a5bbd37bb67f05