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

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

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