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

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

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