Merge "Cleanup modifyRoutes" into main am: 9fea45db05

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

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