Merge "Updateability: Resolve hidden api usages to android/net/NetworkUtils"