Merge changes I065f5c5d,I57656492 am: 2cdf91dd3e

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

Change-Id: Ia148212e9d4aaa11b4d858cfb97d6d124be6c09c