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

Change-Id: I3420e8d84c9e7441a1503329f414fa6c2db66b72