Merge changes from topic "am-47ae1daaa8914ec598829809da6783ca"

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