Merge "Add tagSocket/untagSocket NDK APIs" am: d992ee2925 am: 358573e8a3 am: cfdc49a491

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1938795

Change-Id: I1c005cbc1d888310e17c6105c0dd2457d4cc1c86