Merge "New apn overwrites existing apn, when created with same name but different apn type" am: 64d9db370b
am: d6470cfbc6

Change-Id: I7c26d07753c4ac4abedf3cb21c8e817e9da92526