Merge "Competing network interfaces" am: 44a20af4a3

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

Change-Id: Iad4f9bde61143f37fa7df00c8f17b3d07e0059c3