[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: 83701da866 -s ours am: 20a3ae7608 -s ours

am skip reason: Merged-In Idfc956a95f3de6a59d526804cba1f7705c9dacfd with SHA-1 2dee62856f is already in history

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

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