Merge changes I7db582ac,Ie68b88c4 am: a9adef9c6c

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

Change-Id: I668bb5381e9042d2be0f46cf5c7ae687eb9fd3ee