Snap for 8564071 from 22216534944c6f96a2c997ddbab70d16379e6f42 to mainline-conscrypt-release

Change-Id: Ib9b2bef9e8b586d11817fed6e775b34a4cd95b04