Update exceptional cases handling RPCGenericTests

Author: bilal-alsharifi

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java

@@ -229,8 +229,6 @@ private Map<String, RPC> getRPCsMap(String fileName, boolean includeMandatoryPar
                                 rpcName = "OasisAddress";
                             } else if (rpcName.equals("ShowConstantTBT")) {
                                 rpcName = "ShowConstantTbt";
-                            } else if (rpcName.equals("messageType")) {
-                                rpcName = "MessageType";
                             } else if (rpcName.equals("EncodedSyncPData") || rpcName.equals("OnEncodedSyncPData") || rpcName.equals("EncodedSyncPDataResponse") || rpcName.equals("FunctionID")) {
                                 skipRPC = true;
                             }
@@ -416,6 +414,9 @@ private Map<String, RPC> getRPCsMap(String fileName, boolean includeMandatoryPar
                             if (Character.isDigit(elementName.charAt(0))) {
                                 elementName = "_" + elementName;
                             }
+
+                            // Replace "-" with "_"
+                            elementName = elementName.replace('-', '_');
                             // -------------------------------------------------------------------------------------------------------------
 
                             Element element = new Element()