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

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



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