[automerger skipped] Merge "add carrierid in subscriptionInfo" am: dcab1747cf am: 0ee1e893ac
am: eb04d15cd8  -s ours

Change-Id: Ic651931441d2dd48c25fd775c853c318e753e907