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

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

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