Merge "Revert^2 "Remove references to android15-6.1 microdroid kernel"" into main am: 1743a86754

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

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