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
am: ab1f0dbffa

Change-Id: Ic53e7d28258e49e56033c61ca44f2e171f2cc110