Merge "DO NOT MERGE: Add multi-window feature for CrossAppDragAndDropTests" into nougat-cts-dev
am: d33600138c  -s ours

Change-Id: I1a67bb6c079c8969913f045ecb2671c187876730