[automerger skipped] Merge "Treat RouteInfo with different interfaces as...

[automerger skipped] Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f561 -s ours am: 460f96dd -s ours

am skip reason: Change-Id I57987233d42a0253eaee2e1ca5f28728c2354620 with SHA-1 c3dec344 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882397

Change-Id: I35e9898e25ff2b74c3876f0a19ce8dd6b6514011