Merge "DO NOT MERGE: Allow any suitable stack for TestActivity" into oreo-cts-dev am: 09b9d6a799  -s ours am: 895e45b4af am: e5ebc24d39 am: 6ed52abe37
am: e4f65283c6  -s ours

Change-Id: I5dd3e3f1f7b0f58f5a411ca0daad02080b3206da