Merge "Competing network interfaces" am: 44a20af4a3 am: cac7575885

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

Change-Id: I6063144af454a7eda179ec06cea816ac033e002e