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

Change-Id: I517cd9638544ced0117a7222b21c92940b52885e