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

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

Change-Id: I1af84d94779afd8ac2ca11de2cc19194a8d89537