Support data profile merging

Added merging two data profiles that have same APN name,
but APN types are mutually exlusive and other fields are
minor different.

Fix: 216203549
Test: atest DataProfileManagerTest

Change-Id: I6f398321cc972be0b5fb4c550f7a110049d896f6
Merged-In: I6f398321cc972be0b5fb4c550f7a110049d896f6
1 file changed