Merge "Call the DT sanitize routine ealier" am: b96468fc61 am: d33a1b75db

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

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