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: Ie74e4e0017ce4d514d5d458e05c2b226164a3bb6