[automerger skipped] Merge "Fix ethernet enable / disable API" am: 5099eb16...

[automerger skipped] Merge "Fix ethernet enable / disable API" am: 5099eb16 am: b6c7500f am: 6e1d1add -s ours am: 51dbd3f0 -s ours

am skip reason: Merged-In I3361ad0e01e761ffd77faf6c55924fa4612ede90 with SHA-1 7c02f4cc is already in history

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

Change-Id: If4d24cf1839fee2949f221f323f04be000d39979