Merge "Revert "[User Manager] Add NETWORK_STACK permission."" into tm-qpr-dev