Merge "Cleanup modifyRoutes" into main am: 9fea45db05 am: 1c49f7f274

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

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