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

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

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