Merge "Merge "DO NOT MERGE: Allow any suitable stack for TestActivity" into oreo-cts-dev am: 09b9d6a799  -s ours" into oreo-mr1-cts-dev