Merge "DO NOT MERGE: Allow any suitable stack for TestActivity" into oreo-cts-dev