hammerhead: prefer SPN over PLMN name

Prefer SPN over PLMN name in network scan response.
This will avoid differen PLMN names to be displayed to the user
for (same plmn + different rat)s. RIL uses this property

Bug: 10123151
Change-Id: Ic9b3b92420b23b4e327b24dc3477bcb8bac00bbd
2 files changed