Merge "Update tests for TLS 1.3 by default"
am: fdaaed4cf1

Change-Id: I20da3479909147be65d1e27e1d7815c4cf6a6112