Merge "Add mcc/mnc to SubInfoRecord" into lmp-dev