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