Update split with self test since it didn't account for contextual split

* Right now we split from all apps and we stay in all apps with
contextual split.
* We now have 2 paths, if we are in contextual split then we
should select the same app from all apps again

Fixes: 323418145
Change-Id: I3bde59847b9e47951a6acdc93660b600114c3ddd