Merge changes from topic "celebrity-endorsements-expected_upstream"

* changes:
  Re-merge 'Import java.util.zip from jdk-17.0.4-ga' into aosp/master
  Import java.util.zip from jdk-17.0.4-ga