Merge changes from topic "merge-wc-amw"
* changes:
ActiveModeWarden: ensure wifi is re-enabled if disabled by ECM
WifiController: Only go to scan mode if we are NOT in airplane mode
Fixed WifiController test cases that were moved to ActiveModeWardenTest
Moved test cases from WifiControllerTest into ActiveModeWardenTest
ActiveModeWarden refactor: Fixed all unit tests except WifiControllerTest
ActiveModeWarden: made EcmState into an abstract base state
ActiveModeWarden: Clean up code so that code compiles
Merged WifiController and ActiveModeWarden.ModeStateMachine
WifiController: Inline callbacks that are only used once
Move WifiController into ActiveModeWarden as an inner class
Clean up ActiveModeWarden before merging WifiController
Migrate WifiServiceImpl to use WifiThreadRunner
Create helper class to run code on main Wifi thread