Merge "Adding CarrierConfig for IDC (id2447,carrier25915)" into main