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

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

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