Merge "Update data type and comments on tagSocket/untagSocket APIs" am: ef89731cd3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049804

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