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

* commit '7299ce924f8c0cc166af74429766c204001f5d5f':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I23779849aa8bbe7627c546e8f3895d065ece83a3