TableWithContainerRequiringEqualsForItemId test upgrade (#14292)

Change-Id: I08da5a69e11f625d3d34f26dbd097d7a0973a541