Merge "Add protection for setLocalRoutesExcludedForVpn" am: 620ea6f1fc am: 24e279166f

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

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