Merge "DO NOT MERGE: testAspectRatio with resizeableActivity false" into nougat-mr1-cts-dev am: 29052d250c  -s ours am: a5e1881e33 am: 181e7299ab
am: 662345dca0  -s ours

Change-Id: I4517d8e7016cac348c25ea7a97320ac708a3a38c