Snap for 7550844 from a3f77bcc2f72384463678ec0144b58dfaee3576c to mainline-conscrypt-release

Change-Id: I2ab7b242f87898dd85db43ace61a6b8a4527c5b0