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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebb7d28407d17d71d5623eef514ee0b4baee372e