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

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

Change-Id: Ibe919ea7c2096094fdb48fc91881d9f19678ac50
tree: b33ecf794135daaa298cf2144dd70f4fbedd4873
  1. core/
  2. services/
  3. tests/