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

Change-Id: I39f80f1fc880c6646afde20426eb6b24179dfb45