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

Change-Id: I39bc9e2600405b6f40fb7a866d40f241b5775d93