Merge pull request #15874 from Rik/simslot-965155

Bug 965155 - SIM manager will set all outgoing settings to SIM 2 after r... r=etienne
(cherry picked from commit 0cb3631191ef12947e981c0ff35e9d27256972cf)