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

Change-Id: Ica1cd635881e28160b8352c019619dd937720913