Merge "Add minWidth/minHeight attributes to freeform stack test activities" into nougat-mr1-cts-dev am: 64fd4c174e am: 15c1c7df9e
am: 8657035830

Change-Id: Id50ec0396d12ac2aad3e08381e7d047b411dc2c5