Merge "Remove spurious WTF on pre-U devices." into udc-dev am: 60ec7781ed

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

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