Merge "add carrier id in subscriptionInfo" am: f768ec6a58
am: 452b45c7aa

Change-Id: Icb37e7f65c9fd90f43bc085b3b83e9225e9e0e77