Merge changes from topic "celebrity-endorsements"

* changes:
  Merge java.util.zip from jdk-17.0.4-ga into the aosp/master branch
  Import java.util.zip from jdk-17.0.4-ga