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

* commit '60f0078dc254e78824095106cada08b5eabac600':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I810db6a7694445696f5d431f51064ee14a5b5e04