Merge "Revert EXCLUDED_ROUTES to only keep RTN_UNICAST" am: 16e244ed0f am: e6c418bbff am: 8d6022df42 am: 7f957f318a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2155195

Change-Id: I79ed2fc25d4ce7095f7206d69de2c052eba04b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>