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

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

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