Merge "delete socketTag test" am: 4cd99a8204

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2620255

Change-Id: I97e3a946c3a43f11d6517b49aa7fa9994f50892e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>