Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev am: af6236d06f
am: 700da14d84
* commit '700da14d84deea6c6396ee40a324d8b3c4aa6118':
Change-Id: Idd6d22440f0863fcb30663114ab07ac08a4a9303
This commit is contained in: