Merge "add carrier id in subscriptionInfo"
am: f768ec6a58

Change-Id: I183bb3d3a48a4649499aa19d01ed2db42dc67aa8