Merge "always add swiotlb size to memory size for protected VMs" into main am: ddde3ab5e1

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

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