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