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

This reverts commit 17a43459ed7204fbfab78e19a47245758a6a56e6.