Merge "Treat RouteInfo with different interfaces as different routes" am: d77e15c125 am: 157191f50f am: 7a49a3b538

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

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