Merge "Add tagSocket/untagSocket NDK APIs" am: 8fc5367b3f am: f32288186b

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

Change-Id: Id7812751888340962e9ab8c689da3dc80e9bef90