Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 3200012..1e6549f 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -52,6 +52,8 @@
     { AID_MEDIA, "common_time.config" },
     { AID_KEYSTORE, "android.security.keystore" },
     { AID_RADIO, "telecomm" },
+    { AID_RADIO, "isub" },
+    { AID_RADIO, "ims" },
 };
 
 uint32_t svcmgr_handle;