Merge boxed types and String from jdk-11.0.13-ga

No known functional change.

Bug: 226374336
Test: m droid
Change-Id: Icae74984fc42d889002879a3711b98e3882bb489