Merge "Merge "Add minWidth/minHeight attributes to freeform stack test activities" into nougat-mr1-cts-dev am: 64fd4c174e  -s ours" into oreo-cts-dev