[automerger skipped] Merge "expose Carrier Id related APIs" am: 18b925a7af am: 0031ae8145
am: 31cf647396  -s ours

Change-Id: Id7d9376286fa9152532c9d967563d172e8601e8f