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

Change-Id: I40db08d05733dcc766c6d887c372ac450d33bd9d