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

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

Change-Id: Iba730dfc865dee152f31601dc3b70b45d0978f88