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: ee5ecae2
am: 6d43abd5
Change-Id: I6f459c00629f9a8f4157a731cd9a888d05e42b66