Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions." am: 7d099030de am: 6270ac2534
am: f0fd3492b5

Change-Id: I0ba766329f91e28782feadf2c99fb973f188854a