[automerger skipped] Merge "Fix ethernet enable / disable API" am: 5099eb16c0 am: b6c7500f51 am: 6e1d1adddf -s ours am: 51dbd3f070 -s ours
am skip reason: Merged-In I3361ad0e01e761ffd77faf6c55924fa4612ede90 with SHA-1 7c02f4ccc4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028166
Change-Id: I93c9a6ab0dd26f59f5cadd9aa5dbf588d0afc3ef
This commit is contained in: