Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Fix hostname parsing in java.net.URLStreamHandler.

Change-Id: I4d26b24446f8857647a6f95103360d413dc81ceb