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

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

Change-Id: Id17914c8247e754e74c9434a6e6843b703ca2daf