Merge "Add Carriers.APN_SET_ID and NO_SET_SET" into pi-dev am: 47c3c87c0c
am: dd91ec68d4

Change-Id: I2a084eb89c5857fdcaa2a8b89912934e9d4bcfe2