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

Change-Id: Ib40145570cb7f205e518a077724bb6598456df12