OpenJDK 11: Merging in more java.util.* trivial changes

This is a part of merging upstream changes from OpenJDK 11.28. It
updates classes with trivial changes (some code but no behavior
changes).

Bug: 198640665
Test: m droid
Change-Id: Idc68fc223ad2a6fe5986149019d012028e192170