Merge "NetworkManagement SocketTagger: Migrate QTagUid support to JNI."