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

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

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

Change-Id: Ic398329038eb9e91f6ad9676865448f7317edeef