Merge changes Iab565e85,Ic48be15a am: 547bb05798

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

Change-Id: Ie920f4d0e28dd69c369f7987a78f761bf7b00f0a