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

Change-Id: Ie11c7e05f72f6838565451aa9814fa6ffcd51e1b