Only fail the Android Resolver in a more specific case

The Android Resolver should only fail to warn the user about Gradle project change in Unity
2019.3+ if
1. In Unity 2019.3+
2. The project is using mainTemplate.gradle
3. gradlTemplate.properties is not enabled
4. Jetifier is enabled
5. "Patch gradleTemplate.properties" is enabled.

The 2nd condition was not checked.  As a result, it can fail even the user is not using
mainTemplate.gradle.

Change-Id: Ie658ef1ced520ee8c5ccecb1d9f1cc8b05e6180b

Author: chkuang-g

source/AndroidResolver/src/PlayServicesResolver.cs

@@ -1916,15 +1916,18 @@ private static void ResolveUnsafe(Action<bool> resolutionComplete,
                     Google.VersionHandler.GetUnityVersionMajorMinor() >= 2019.3f &&
                     SettingsDialogObj.UseJetifier &&
                     SettingsDialogObj.PatchPropertiesTemplateGradle &&
+                    GradleTemplateEnabled &&
                     !GradlePropertiesTemplateEnabled) {
                         lastError = String.Format(
-                            "Resolution failed because EDM4u could not enable Jetifier " +
+                            "Resolution failed because EDM4U could not enable Jetifier " +
                             "in Unity {0} without Custom Gradle Properties Template. " +
                             "Please enable 'Custom Gradle Properties Template' found under " +
                             "'Player Settings > Settings for Android -> Publishing Settings' menu. " +
                             "Due to changes in Gradle project generated by Unity 2019.3 and "+
                             "above, our recommended way of enabling Jetifier is by injecting "+
-                            "properties to Assets/Plugins/Android/gradleTemplate.properties.",
+                            "properties to Assets/Plugins/Android/gradleTemplate.properties.\n" +
+                            "If you like to patch this yourself, simply disable 'Patch " +
+                            "gradleTemplate.properties' in Android Resolver settings.",
                             Google.VersionHandler.GetUnityVersionMajorMinor()
                         );
                         return false;