Drop the "Config". Just "CarrierService". It's cleaner.

b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
diff --git a/Android.mk b/Android.mk
index fe8203d..c1382ad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -214,7 +214,7 @@
 	core/java/android/os/IUserManager.aidl \
 	core/java/android/os/IVibratorService.aidl \
 	core/java/android/security/IKeystoreService.aidl \
-	core/java/android/service/carrier/ICarrierConfigService.aidl \
+	core/java/android/service/carrier/ICarrierService.aidl \
 	core/java/android/service/carrier/ICarrierMessagingCallback.aidl \
 	core/java/android/service/carrier/ICarrierMessagingService.aidl \
 	core/java/android/service/gatekeeper/IGateKeeperService.aidl \