Temporarily reenable 3P condition providers.

This code will go away once there is a better way for a user to
approve 3P CPs.

Change-Id: I56a72d03a75c2c60f6f19f82f091d9a1c7f3f715