Merge "Merge "DO NOT MERGE: Fix WindowManager host tests for devices that have window outsets." into oreo-cts-dev am: ac76d0c2f4  -s ours" into oreo-mr1-cts-dev
am: 92d9ad7f27  -s ours

Change-Id: I79bb7362f6fd19ee0692c80950d7af365000f597