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

Change-Id: Idaae905d055b103064c6af5fb514853bd98be8ab