am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '025f0938544bae3262acc24e9c6031b6de88901d':
  Changing usage of carrier name field of SubInfoRecord