am 778eccf4: Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom

* commit '778eccf4923571c77f158e92b2f5f0f7dfd21875':
  Check null of pidPair to skip the case the service record has been removed