Merge "Fix ImsMmTelManager API in accordance with the council"