clang-format: [Java] Further improve generics formatting.