Merge "[MS26.1] Remove Process.NETWORK_STACK_UID dependency"