Clean up ActiveModeWarden before merging WifiController

Clean up code in ActiveModeWarden before merging
WifiController into it.

Bug: 139157226
Bug: 140132974
Test: ./tests/wifitests/runtests.sh
Test: Regression tests
Change-Id: Ib170f9ba4aa3b9520143c00539a27cf6005b5bd7
3 files changed
tree: edec205ed817edfc3191d825ce66368ac2cc0a0e
  1. service/
  2. PREUPLOAD.cfg