Merge "Cleanup modifyRoutes" into main am: 9fea45db05

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

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