[automerger skipped] Merge "Fix addRoute replace default route unexpectedly" into rvc-dev am: 887941cb -s ours
am skip reason: Change-Id I7153ec9866f14a109ba8155c905e5d9e4f85eb64 with SHA-1 4fe1889b is in history
Change-Id: Iada19e842e8728858517dca1de7a0def0748e157