Merge "Fix for testFreeformWindowManagementSupport" into nougat-cts-dev am: f6dda99601
am: 4dcc9cb220

Change-Id: I753b01db4ca2e224578819e0e1260e96aa2614fc