Merge "Revert EXCLUDED_ROUTES to only keep RTN_UNICAST" am: 16e244ed0f am: e6c418bbff

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

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