Merge "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" into nyc-mr1-dev
am: 834faaee88

Change-Id: Iff784c6b58f4409c9d676e8c5c25c1d4c705ad56