am 392282f1: Merge change 5962 into donut

Merge commit '392282f1e01518491c6536d931500c4bfac7f24f'

* commit '392282f1e01518491c6536d931500c4bfac7f24f':
  SimRecords.getServiceProviderName() always returned null.