Merge "Add carrier config option to determine if "wifi-only" is supported."...
Merge "Add carrier config option to determine if "wifi-only" is supported." into nyc-dev am: 6c4af8c9
am: bbebbd35
* commit 'bbebbd35':
Add carrier config option to determine if "wifi-only" is supported.
Change-Id: I9b574978187badb6b5ce7efde003e7b51eee14b5