Merge "Add protection for setLocalRoutesExcludedForVpn"