Merge "Competing network interfaces" am: 44a20af4a3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903360

Change-Id: I358c9a83623dd93ce06d423bcde7720f1dc39a84