Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
am: 8fde916de8

* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
  disable wifi only mode from wfc setting for nyc

Change-Id: I3083a247a81dcb22042791a7df7c54f3a3484958