Merge "Add getUidFirewallRule to ConnectivityManager"