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

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

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