Merge "Merge "DO NOT MERGE: Skip multi-window test if not supported" into nougat-cts-dev am: 9878d0cb32  -s ours" into nougat-mr1-cts-dev
am: fbb2b0f4fe  -s ours

Change-Id: I5a6138845cfd119e65927cf266b525b01ee5a621