Merge "Add the new row APN_SET_ID and default NO_SET_SET" into pi-dev am: e1d8eb3797
am: 7cb905db58

Change-Id: I86fdcf367c68dcc5ddd762290fd7643e93f1f2c3