Merge "Fix handling of tests for variants." am: 8ddcc6c479

Original change: https://android-review.googlesource.com/c/platform/development/+/2584688

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