Merge "Remove spurious WTF on pre-U devices." am: c2851d45fd am: 80e186e43d am: a1d077267e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618590

Change-Id: I74ff8480827d125ec27d8578c135843a93c2fbb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>