Merge "expose Carrier Id related APIs" am: 18b925a7af
am: 0031ae8145

Change-Id: I6e9837cffdcac094557ea99cde0736abdfff0ff9