Merge "Treat RouteInfo with different interfaces as different routes" am: 6d4e2d5ec3 am: a89e9a29a3

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

Change-Id: I2f4d88aa74588e8ed27c5d0abcb9a6919f26f27d
tree: 584b55e2ed704c7e0c2301b3c4572176694f6eef
  1. core/
  2. services/
  3. tests/