Existing APN profile is incorrectly getting merged

Added more fields protocol and roaming protocol to the primary key.

Bug: 28757188
Test: No tests
Change-Id: I00955aaabd73882c1eb25def2c9f7007c647b818
2 files changed