Merge "Track if untrusted wifi network is allowed" into nyc-mr1-dev
am: 9afa893f79

Change-Id: Id4b010752939a8251a161052df1c032215d3e8fd
tree: 40b42d4bf828c23f31d84b9fdee2e0a77267ffdc
  1. service/