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

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

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