Merge "Support set/get carrier id from ApnSetting"