Merge "fix the issue that update carrier id to the wrong subId during switch"...
Merge "fix the issue that update carrier id to the wrong subId during switch" into qt-dev am: 63001992 am: 2f503a9f
am: 7b6ed4b9
Change-Id: I6004c984f11459f5f58c22de6a948afa259c44e0