Format some imports using fix_imports.py

Unfortunately this tool isn't smart enough to deal with the assertThat
situation (which has two static imports of a function with the same name).

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

java/google/registry/keyring/api/ComparatorKeyring.java

@@ -16,19 +16,15 @@ package google.registry.keyring.api;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
-
 import google.registry.util.ComparingInvocationHandler;
 import google.registry.util.FormattingLogger;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Objects;
-
 import javax.annotation.Nullable;
-
 import org.bouncycastle.bcpg.BCPGKey;
 import org.bouncycastle.bcpg.PublicKeyPacket;
 import org.bouncycastle.openpgp.PGPKeyPair;

java/google/registry/keyring/api/DummyKeyringModule.java

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package google.registry.keyring.api;
+
 import static com.google.common.io.Resources.getResource;
 import static google.registry.keyring.api.PgpHelper.KeyRequirement.ENCRYPT_SIGN;
 import static google.registry.keyring.api.PgpHelper.lookupKeyPair;