Snap for 7550844 from a2707050575cdf1c3a3519c0a6bc0535a581c6a1 to mainline-conscrypt-release Change-Id: I2b05e0a657eb979b161cd96cd8578711137ca196