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

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

Change-Id: I1e392904d89cfeae5158c4031e3fd5c2e66fc521