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

* commit 'c4cc07b2c7f91cdb3695c499f7dca17b8aa9cb6b':
  Revert "Getting mcc/mnc from system prop instead of subInfoRecord."