[automerger skipped] Merge "DO NOT MERGE: Delete the last remaining user of TestNetworkStackLib." into mainline-prod am: ae64e2b7e9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13737397 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I30fd4e9ee8dbb0be886da2910541720c2d620246
This commit is contained in: