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

Change-Id: I9e6d93035417891222c86078b049eeab4312fa05