[automerger skipped] Merge "add carrier id in subscriptionInfo" am: f768ec6a58 am: 452b45c7aa
am: 2827f6de70  -s ours

Change-Id: I48b3196605fd9ef530c3bdc59565b43c87a2e035