[automerger skipped] Merge "Merge "Update test host used for TLS host verification." into qt-dev am: 0db9c1e7f3 am: 13964c8ae9" into qt-r1-dev-plus-aosp
am: 6b6bf24878 -s ours
am skip reason: change_id I6e8c8757963ef46009767925bfa512127d9daba7 with SHA1 50795d03cd is in history

Change-Id: Idebe08192c66195d6829f34d3c38994949a9aa65
tree: 25bf4063c210f1043ca74fcdeebfec91ac6822b3
  1. tests/