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

Merge "Match underlying networks based on interface name" am: d7f30280 am: b8935449 am: 6047b6ba am: 384e212b am: 95486f83

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



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