Merge "delete socketTag test" am: 4cd99a8204 am: b624f35b83

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

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