[automerger skipped] Merge "Skip 25Q1 (ab/BP1A.250305.020) in aosp-main-future" into aosp-main-future am: 890a395c25 -s ours

am skip reason: Merged-In Ib2ebdd937245dd5cf33825a290742ee03a79dc0b with SHA-1 a584f0f790 is already in history

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

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