Merge "Update data type and comments on tagSocket/untagSocket APIs" am: 6b72346318 am: e32af6a222

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2050124

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