[automerger skipped] Merge "Cleanup modifyRoutes" into main am: 9fea45db05 am: cf1d928dd6 am: 4676192fe0 -s ours

am skip reason: Merged-In Ief0a79883bcc2c5493807c548cb71ef655abed23 with SHA-1 6473aede2e is already in history

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

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