Merge "Add --prefer-staged to composd_cmd test-compile" am: 84e839294e

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

Change-Id: I93e7f889e4b93bb3f0d445ac56814f2aa496a549