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