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

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

Change-Id: Id4d0e3cea02a912d637cce2f3ee298ce9fd4acbf