Merge "Fixing transition CTS test for devices that specify a window outset" into oreo-cts-dev