Merge "Add the new row APN_SET_ID and default NO_SET_SET"
am: e30994cdd6

Change-Id: I86885487794f5fa7beec814c4008e9d1f4d6586e