Merge "Merge "DO NOT MERGE: Skip multi-window test if not supported" into nougat-cts-dev am: 9878d0cb32  -s ours am: 2929171d92 am: 3c51bc8deb" into nyc-mr1-dev am: 3ce07e787b
am: 8dd0c91126

Change-Id: I3738075e7655211e747114df4295231fea33a6bc