Merge "Remove NetworkPermissionConfig package" into tm-dev