Revert "[2/2] frameworks/base: Add Captive Detection toggle"

This reverts commit 9e702ad3d5cbd3245cd07ee986fbafcd7b28be3e.