Merge "DO NOT MERGE Fix for #testLaunchToSideMultiWindowCallbacks" into oreo-cts-dev am: bebd81b9e8  -s ours am: 625fd1ddfa am: aa1c276676
am: f15bb6dbb4

Change-Id: Iac9460613e97f41d0b208befbd9adabe843bc239