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

Change-Id: I1fdafb42ee7f5e17b47980f37dfe764ca3f9d904