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

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

Change-Id: I7b687d3698bc7321b3aa48dc4014346c70443fa0