Snap for 7132927 from 1d625fedba5d85c916b58c4a0e2e25df148a9aa7 to mainline-conscrypt-release

Change-Id: I3b7f1286fc21522717e888ead1b5346bb9b89544