Snap for 8512216 from cfce2e79601f88e0d52484f8bf26dc81d0851052 to tm-frc-conscrypt-release

Change-Id: I5646c89be81ac1b88429bf6e8f89b1ba61c1cdbe