Make removeClaimsEntityId check case insenstive

Bug: 54109

Change-Id: Idd98d9d9e8c6843002510ee9ff95f1c260bea57e
Merge "Make removeClaimsEntityId check case insenstive"