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

Change-Id: I3ae0ccca5228bf67af8cb5cb8cf6fa56527cad5c