[automerger skipped] Merge "Add the new row APN_SET_ID and default NO_SET_SET" am: e30994cdd6
am: ca23725587  -s ours

Change-Id: I00991fc3d20e3e890f07ace31eafa69e89d0398b