Rhea Ripley will team with Io Shirai to face Charlotte Flair and a partner of her choice