Ensure TLSv1 is still enabled by default unless it's deprecated. am: 85189a80f5 am: a53d670ff0

Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/2862205

Change-Id: Ibe323171551fae0a4fc4bbc54de0199502047e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>