Merge "DO NOT MERGE: Skip the test if don't support multi-window" into nougat-mr1-cts-dev
am: cd7505a9f7  -s ours

Change-Id: I3d6273dbffb79155028f6a4dc8c2b04158afd6a4