Merge GSM and CDMA APN lists

Change-Id: I43c394f90f866bea52f2a2d2c556f9c7e85c836b