Merge "DO NOT MERGE: Skip multi-window test if not supported" into nougat-cts-dev