Merge "Do not send WTF when ETHERNET_SERVICE" am: f03005d5e0 am: e7e458954c

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

Change-Id: I7e06f19d39feb659a7345160db443059e4a69912