Merge "Competing network interfaces" am: 44a20af4a3 am: 577192d9f1

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

Change-Id: I17ca3345f674cf7ac90bff423c949e5af8e12e46