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

Change-Id: I199eaf0cc4ba2cc03c4cf3dfe2dbafd6a227f04f