Clean up hashCode/equals of SessionTokenImplBase

#minor-release

PiperOrigin-RevId: 463338680

libraries/session/src/main/java/androidx/media3/session/SessionTokenImplBase.java

@@ -103,7 +103,7 @@ import java.lang.annotation.Target;
 
 
   @Override
   @Override
   public int hashCode() {
   public int hashCode() {
-    return Objects.hashCode(type, uid, packageName, serviceName);
+    return Objects.hashCode(uid, type, version, packageName, serviceName, componentName, iSession);
   }
   }
 
 
   @Override
   @Override
@@ -113,9 +113,11 @@ import java.lang.annotation.Target;
     }
     }
     SessionTokenImplBase other = (SessionTokenImplBase) obj;
     SessionTokenImplBase other = (SessionTokenImplBase) obj;
     return uid == other.uid
     return uid == other.uid
+        && type == other.type
+        && version == other.version
         && TextUtils.equals(packageName, other.packageName)
         && TextUtils.equals(packageName, other.packageName)
         && TextUtils.equals(serviceName, other.serviceName)
         && TextUtils.equals(serviceName, other.serviceName)
-        && type == other.type
+        && Util.areEqual(componentName, other.componentName)
         && Util.areEqual(iSession, other.iSession);
         && Util.areEqual(iSession, other.iSession);
   }
   }