Merge "Don't run testTombstonesAreBeingForwarded on user builds" into tm-dev am: 4b758af21b am: a726fe42ec

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

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