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

Change-Id: Ib7ffd88fca3abed521bcf8e44218e2c7e0ba4c85