Merge "Treat RouteInfo with different interfaces as different routes" am: 4156ab6937

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

Change-Id: Ibe919ea7c2096094fdb48fc91881d9f19678ac50