Snap for 8746144 from ff9e945e1b5b5966cfc75b3c954e62076ea9ea00 to mainline-conscrypt-release

Change-Id: I13b5aaaa9546a58e0a6c6bee8de90d8fcd7aa094