Remove straggler references to extended registration years

The actual extendedRegistrationYears field was removed in [] but I
missed a few prose (space-separated) references.

While I was at it, I also swapped the javadoc for approvePendingTransfer() and
denyPendingTransfer(), since their descriptions after the summary fragment were
reversed.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=150782713

java/google/registry/flows/ResourceFlowUtils.java

@@ -209,9 +209,8 @@ public final class ResourceFlowUtils {
   /**
    * Create a {@link TransferData} object representing a resolved transfer.
    *
-   * <p>This clears all the server-approve fields on the {@link TransferData} including the extended
+   * <p>This clears all the server-approve fields on the {@link TransferData}, sets the status
-   * registration years field, sets the status field, and sets the expiration time of the last
+   * field, and sets the expiration time of the last pending transfer to now.
-   * pending transfer to now.
    */
   public static TransferData createResolvedTransferData(
       TransferData oldTransferData, TransferStatus transferStatus, DateTime now) {
@@ -229,16 +228,15 @@ public final class ResourceFlowUtils {
   /**
    * Turn a resource into a builder with its pending transfer resolved.
    *
-   * <p>This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the
+   * <p>This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the {@link
-   * {@link TransferStatus}, clears all the server-approve fields on the {@link TransferData}
+   * TransferStatus}, clears all the server-approve fields on the {@link TransferData}, and sets the
-   * including the extended registration years field, and sets the expiration time of the last
+   * expiration time of the last pending transfer to now.
-   * pending transfer to now.
    */
   @SuppressWarnings("unchecked")
   public static <
           R extends EppResource & ResourceWithTransferData,
-      B extends EppResource.Builder<R, B> & BuilderWithTransferData<B>> B resolvePendingTransfer(
+          B extends EppResource.Builder<R, B> & BuilderWithTransferData<B>>
-          R resource, TransferStatus transferStatus, DateTime now) {
+      B resolvePendingTransfer(R resource, TransferStatus transferStatus, DateTime now) {
     checkState(
         resource.getStatusValues().contains(StatusValue.PENDING_TRANSFER),
         "Resource is not in pending transfer status.");
@@ -251,10 +249,10 @@ public final class ResourceFlowUtils {
   /**
    * Resolve a pending transfer by awarding it to the gaining client.
    *
-   * <p>This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the
+   * <p>This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the {@link
-   * {@link TransferStatus}, clears all the server-approve fields on the {@link TransferData}
+   * TransferStatus}, clears all the server-approve fields on the {@link TransferData}, sets the new
-   * including the extended registration years field, and sets the expiration time of the last
+   * client id, and sets the last transfer time and the expiration time of the last pending transfer
-   * pending transfer to now.
+   * to now.
    */
   public static <
           R extends EppResource & ResourceWithTransferData,
@@ -270,10 +268,9 @@ public final class ResourceFlowUtils {
   /**
    * Resolve a pending transfer by denying it.
    *
-   * <p>This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the
+   * <p>This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the {@link
-   * {@link TransferStatus}, clears all the server-approve fields on the {@link TransferData}
+   * TransferStatus}, clears all the server-approve fields on the {@link TransferData}, and sets the
-   * including the extended registration years field, sets the new client id, and sets the last
+   * expiration time of the last pending transfer to now.
-   * transfer time and the expiration time of the last pending transfer to now.
    */
   public static <R extends EppResource & ResourceWithTransferData> R denyPendingTransfer(
       R resource, TransferStatus transferStatus, DateTime now) {

java/google/registry/flows/domain/DomainTransferUtils.java

@@ -218,14 +218,14 @@ public final class DomainTransferUtils {
    *
    * <p>If the domain will be in the auto-renew grace period at the automatic transfer time, then
    * the transfer will subsume the autorenew. This means that we "cancel" the 1-year extension of
-   * the autorenew before applying the extra transfer years, which in effect means reducing the
+   * the autorenew before adding the extra transfer year, which results in zero net change in the
-   * transfer extended registration years by one. Since the gaining registrar will still be billed
+   * expiration time. Since the gaining registrar will still be billed for the transfer's 1-year
-   * for the full extended registration years, we must issue a cancellation for the autorenew, so
+   * renewal, we must issue a cancellation for the autorenew, so that the losing registrar will not
-   * that the losing registrar will not be charged (essentially, the gaining registrar takes on the
+   * be charged (essentially, the gaining registrar takes on the cost of the year of registration
-   * cost of the year of registration that the autorenew just added).
+   * that the autorenew just added).
    *
-   * <p>For details on the policy justification, see b/19430703#comment17 and
+   * <p>For details on the policy justification, see b/19430703#comment17 and <a
-   * <a href="https://www.icann.org/news/advisory-2002-06-06-en">this ICANN advisory</a>.
+   * href="https://www.icann.org/news/advisory-2002-06-06-en">this ICANN advisory</a>.
    */
   private static Optional<BillingEvent.Cancellation> createOptionalAutorenewCancellation(
       DateTime automaticTransferTime,