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

Change-Id: Icba6321b893c3359a0637f9003ff8f9f424e9b2b