Snap for 11295620 from 9c5860a467857ea872d61bdea6dbbacaba28a0b1 to mainline-conscrypt-release

Change-Id: Iddce759c22dacc596edb7f35a48edb62f44f9d20