Merge "Existing APN profile is incorrectly getting merged" am: 5045385168  -s ours am: 770b4b3817  -s ours
am: 2e13a9b3fd  -s ours

Change-Id: I9a1548ec772718c956e0019181968dbe21c38a86