Merge "Update tests for Conscrypt sync." am: 36030839cc
am: 52d5c1f7a1

Change-Id: I6b28886a442f23355abf3d5d7275f088c0c6c298