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

Change-Id: I0d0b4dc06d97c1aa8fe8b131af64bd6f1c61c845