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

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

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