Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev