Snap for 8358640 from 7b50b3f18e06b9e9b78bd4487e7cdfbe1982391f to mainline-go-conscrypt-release

Change-Id: I4d158fcedfd019b55c245daf05ceaf51fad1bf05