Merge "Support set/get carrier id from ApnSetting"
am: 72973de352

Change-Id: I4a789d5aa5730b0571fbd553878775247a565c56