Snap for 8736885 from a896d29f7afb8b7d3191ee572bc33cb2c92c5322 to mainline-go-conscrypt-release

Change-Id: I06fc4d22c7c5504c2f6b52792dcf77a24b52c9ed