Merge "add carrierid in subscriptionInfo"
am: dcab1747cf

Change-Id: I629fb5e0cced6759778435f03a10c3a5cef385b1