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

Change-Id: Ie64e81d267d380b4706367c35ab7ae62a9005d76