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