Merge "Fix all Log.wtfs in FrameworksNetTests." am: 6c77e14663 am: d5333b7255 am: 45553222e1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I715658a8f15dada6fd0f248d897d2bc294bacf1a