Merge "Fixed APN database for GCI" am: 771d7771ea
am: 499e2d5de7

Change-Id: I6f9f7668fe0d04346b8895b6b1200310cb2e975f