Merge "Merge "Merge "Revert "DO NOT MERGE: Fix WindowManager host tests for devices that have window outsets."" into oreo-cts-dev am: f247fa9817  -s ours" into oreo-mr1-cts-dev am: 36609b906e  -s ours"