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
diff --git a/CleanSpec.mk b/CleanSpec.mk
index cce0567..a6c11ef 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -64,3 +64,4 @@
 $(call add-clean-step, rm -f $(OUT_DIR)/target/product/hammerhead/system/build.prop)
 $(call add-clean-step, rm -f $(OUT_DIR)/target/product/hammerhead/system/build.prop)
 $(call add-clean-step, rm -f $(OUT_DIR)/target/product/hammerhead/system/build.prop)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/hammerhead/system/build.prop)
diff --git a/device.mk b/device.mk
index 69261b9..e8eded5 100644
--- a/device.mk
+++ b/device.mk
@@ -288,6 +288,12 @@
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     persist.sys.usb.config=mtp
 
+# Prefer SPN over PLMN name in nw scan response.
+# This avoids different names to be displayed to the user for same PLMN.
+# RIL uses this property.
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.radio.prefer_spn=2
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     rild.libpath=/system/lib/libril-qc-qmi-1.so