[automerger skipped] Merge "DO NOT MERGE: Delete the last remaining user of...

[automerger skipped] Merge "DO NOT MERGE: Delete the last remaining user of TestNetworkStackLib." into mainline-prod am: ae64e2b7 -s ours am: 2573939d -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: I095b311469fe036900ebe9b04e565bd81af39275