Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev
am: 951fe29

* commit '951fe2925ff61b7d11149c3d897763d278ba1006':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: Ide2ad48f7372b1cb017040f299af79f67d67ec30