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

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

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