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

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