Merge "Cleanup modifyRoutes" into main am: 9fea45db05 am: cf1d928dd6

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

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