am 080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev

* commit '080674e6da8e3db392a2a9e96a00cfc8e4635d00':
  Getting mcc/mnc from system prop instead of subInfoRecord.