Merge "Add Carriers.APN_SET_ID and NO_SET_SET"
am: cdb29f97db

Change-Id: I6b004476c47e105b35ec0d3884c660f6b10b8697