Merge "Delete the last remaining user of TestNetworkStackLib." am: 6a01b8d23b am: a49208f178

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibef70ffb262f8446348ae7cc1cb7fd61a089a007