Merge "AndroidManifest.xml: Add new network permission for setup wizard" into pi-dev