Merge "Match underlying networks based on interface name" am: d7f30280

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



Change-Id: Ic709d89e6c66b7e6c1cfa7a222a3d8937f3176b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>