[automerger skipped] Merge "Fix ethernet enable / disable API" am: 04f9843d32 am: 85780a92a2 -s ours

am skip reason: Merged-In I0f2866d09b745e7bdb261a1258f94cfd51223a8f with SHA-1 fa376a5e7c is already in history

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

Change-Id: I9e04d5f1eaf0e35bd3446f341c299e99c2d5b13b