Merge "Fix ethernet enable / disable API" am: 24f7b378c2 am: 6899408f90

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028166

Change-Id: I39dc99e3fefe7975911aa3217b3bcdd3607bbd26