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

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

Change-Id: Ib69c8fde2c2a4daca9ee79de4c14381df8364095