Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method""