Merge changes I9b387da8,Iabeca8c4 am: 2c770e73a7 am: ef54c9ec4b

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

Change-Id: Iea0adfaf5d88f448f8d8f93ff1848ad2a88fda17