Merge "DO NOT MERGE: testAspectRatio with resizeableActivity false" into nougat-cts-dev
am: 5db3398f9d  -s ours

Change-Id: If3c2ce5c355a8ff9cdd08cd99d322f1ae0bbb9ed