Revert "hammerhead: prefer SPN over PLMN name"

This reverts commit 092a1c33fa28400815bef58f3052ffb825c69554.

Change-Id: I8346c378b620ef560546c40d34a779cfb8a8d1c1
2 files changed