Merge "ethernet: reenable testUpdateConfiguration_forOnlyCapabilities" am: 1b8cac56b9 am: 183629c2ea am: 1a70a9a153

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

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