Merge "Don't make an interface default if it has defined capabilities." am: 81f162992e am: 2318461b6b am: b2e9e8a81c am: e7ed34d9b6

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

Change-Id: I9cc693187c00a36bede3d27cc0c9fcec6ccba24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>