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

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