Merge "Change hardcoded vm_dtbo_idx" into main am: 9b56f9a9b9

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

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