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

Change-Id: I3fec139b8023fe72b3ab6348a85ab01db00b5add