Merge "new carrier id APIs" am: 3d23b90874 am: 7537309843
am: ea5e2ad900  -s ours

Change-Id: I9c157b38bbf8c942bafdb1467d49091a7c3c7264