Merge "Merge "Merge "DO NOT MERGE Fix for #testLaunchToSideMultiWindowCallbacks" into oreo-cts-dev am: bebd81b9e8  -s ours" into oreo-mr1-cts-dev am: 110a6c5cff  -s ours"
am: a79854683f  -s ours

Change-Id: I85b22e91ddb69c56290645a7375d8dab4b5a2091