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

Change-Id: I09cae9273691f80513fd0a5cebd5c8dbc10a4660