Merge "Correct uid to app id for netd traffic permission methods"