Merge "Use a wrapper around ANW to allow updating Surface" into main am: 8808313b13 am: bcf4fdb354

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

Change-Id: Ie242c55c1c467e9049da4b8886fa067d11a951f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>