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

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

Change-Id: Id8f9081c62a1a6d9e05d2cb7094439617b5f0522