Merge "Remove an unused dependency on conscrypt" am: 7fe2b3ec69 am: 7fe0ebc875
am: be1e0715ae

Change-Id: If94d3467898320d952f95e55023092b0169c8835