Merge "Exclude NET_CAP_LOCAL_NETWORK when listening for upstream network events" into main