Merge "Only adopt MANAGE_TEST_NETWORKS, not all shell permissions."