Merge "Merge "Don\'t show data disabled icon when user isn\'t setup" into...
Merge "Merge "Don\'t show data disabled icon when user isn\'t setup" into nyc-dev am: ede4fcea am: cfe52d8f" into nyc-mr1-dev-plus-aosp
am: 76e6b0bb
* commit '76e6b0bb':
Change-Id: Iaa8b6e52e03368a512ed409dbc93e01d90933cac