Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Track behavior change in default HostnameVerifier." into oreo-mr1-cts-dev am: e79d676601 -s ours" into pie-cts-dev am: f79b99d030 -s ours am: 012ae97680 -s ours am: 9cc0d83440 am: bf413adf11 -s ours am: 9074a894d0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ba9f282dfd1428a6e59dde02c5e48eb2f7139a5