Applying to d1-dev as this change will be propagated to qpr branch.
Remove Developer Option Enhanced Connectivity. Remove controller and
layout variables/tests.
Bug: 162231796
Test: On Device Custom Build. Testing BSM trigger. Developer Option does
not appear anymore.
Change-Id: I8a385eb444e84975a3bbd7c063c5ce94e507c25f