Merge "Remove slot ids from sSlotIndexToSubIds if they have the same sub id"...
Merge "Remove slot ids from sSlotIndexToSubIds if they have the same sub id" into rvc-dev am: f4b8e278 am: 493d3f80 am: 77231502
Change-Id: Iee4dba72f7158368a92c7f99327f394e7219a238