[automerger skipped] Merge "[RESTRICT AUTOMERGE] Track behavior change in default HostnameVerifier." into oreo-mr1-cts-dev am: e79d676601 -s ours am: aabe25da47 -s ours am: e6554d1859 -s ours am: 2ee26d8d6c am: 70cd8e994a -s ours am: 7a9f1b4898

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1547918

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib83ae5622c83f3b597745c59097775d373fe7248