Fix JNI bug in clientType

-- Fix icd clienttype with integer and align with generated type for clientType in other generated file
-- Fix missing semicolon in the end of ()Ljava/lang/Short

Author: yunhanw-google

src/controller/java/AndroidDeviceControllerWrapper.cpp

@@ -527,7 +527,7 @@ CHIP_ERROR AndroidDeviceControllerWrapper::ApplyICDRegistrationInfo(chip::Contro
     jbyteArray jSymmetricKey = static_cast<jbyteArray>(env->CallObjectMethod(icdRegistrationInfo, getSymmetricKeyMethod));
 
     jmethodID getClientTypeMethod;
-    err = chip::JniReferences::GetInstance().FindMethod(env, icdRegistrationInfo, "getClientType", "()Ljava/lang/Short",
+    err = chip::JniReferences::GetInstance().FindMethod(env, icdRegistrationInfo, "getClientType", "()Ljava/lang/Integer;",
                                                         &getClientTypeMethod);
     VerifyOrReturnError(err == CHIP_NO_ERROR, err);
     jobject jClientType = env->CallObjectMethod(icdRegistrationInfo, getClientTypeMethod);
@@ -566,7 +566,7 @@ CHIP_ERROR AndroidDeviceControllerWrapper::ApplyICDRegistrationInfo(chip::Contro
     if (jClientType != nullptr)
     {
         clientType = static_cast<chip::app::Clusters::IcdManagement::ClientTypeEnum>(
-            chip::JniReferences::GetInstance().ShortToPrimitive(jClientType));
+            chip::JniReferences::GetInstance().IntegerToPrimitive(jClientType));
     }
     params.SetICDClientType(clientType);
 

src/controller/java/src/chip/devicecontroller/ICDRegistrationInfo.java

@@ -24,7 +24,7 @@ public class ICDRegistrationInfo {
   @Nullable private final Long checkInNodeId;
   @Nullable private final Long monitoredSubject;
   @Nullable private final byte[] symmetricKey;
-  @Nullable private final Short clientType;
+  @Nullable private final Integer clientType;
 
   private ICDRegistrationInfo(Builder builder) {
     this.checkInNodeId = builder.checkInNodeId;
@@ -48,7 +48,7 @@ public byte[] getSymmetricKey() {
     return symmetricKey;
   }
 
-  public Short getClientType() {
+  public Integer getClientType() {
     return clientType;
   }