Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
am: 0b302499cd

Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b