Merge "Fix to use subId instead of slotId when calling getPhone()" into lmp-mr1-dev