Validate electronic delivery stuff.

Can't have electronic_delivery_keys > 0 and electronic_delivery = false.

Change-Id: I69ae50b18b1ff567892a8284c50e706b974d26d7