Merge "Fix all Log.wtfs in FrameworksNetTests." am: 326cf02637 am: f8b5e2a497

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I640d298f2d25ba1784795c79c38a2561cf9c8882