Change radio related service names to slot1, slot2, slot3...

Test: Basic telephony sanity
Bug: 36570718
Change-Id: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
diff --git a/libril/sap_service.cpp b/libril/sap_service.cpp
index 29c2f38..7bed05a 100644
--- a/libril/sap_service.cpp
+++ b/libril/sap_service.cpp
@@ -919,13 +919,13 @@
     using namespace android::hardware;
     int simCount = 1;
     const char *serviceNames[] = {
-        "sap_uim_socket1"
+        android::RIL_getServiceName()
         #if (SIM_COUNT >= 2)
-        , "sap_uim_socket2"
+        , RIL2_SERVICE_NAME
         #if (SIM_COUNT >= 3)
-        , "sap_uim_socket3"
+        , RIL3_SERVICE_NAME
         #if (SIM_COUNT >= 4)
-        , "sap_uim_socket4"
+        , RIL4_SERVICE_NAME
         #endif
         #endif
         #endif