Snap for 11295620 from 338de715263fa7510e69e97fbf7376a6a119da46 to mainline-conscrypt-release

Change-Id: Ibd0b28103180845a2543eb16b4f6b06461d6f4e7