Revert "interconnect: Do not skip aggregation for disabled paths"

This reverts commit e8bf830e which is
commit 91b44981a2316e7b00574d32dec4fae356444dcf upstream.

It breaks the Android abi.  If it is required in the future, it can
come back in an abi-safe way.

Bug: 161946584
Change-Id: I79424d310d30b477a46796bd8059db192efff1aa
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>