Snap for 8857176 from 449875fdd48ca7fc5d01faeb932d0b8a5f775701 to mainline-go-conscrypt-release

Change-Id: Ie6a461b5723e34fec0d39740540452e0784c2d80