New apn overwrites existing apn, when created with same name but
different apn type

Bug:36378643
Test: manual
Change-Id: I309ca98821d10072495215247a1849214e413cde
(cherry picked from commit 568c8ab3695250d09d55e29d4c89701fe3a5c5a0)
(cherry picked from commit e7039176f5c206c838c0266b54a96277edf0e074)
1 file changed