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

Change-Id: Id181f20e7ddc87ee403a8a0c5b3b0e2448da98cf