Merge "Revert^2 "Adjust tests to account for new DICE mode check"" into main am: b7933ccda1

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

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