Merge "Revert "DO NOT MERGE: Fix WindowManager host tests for devices that have window outsets."" into oreo-cts-dev