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: 04e48435 am: a7b4636e
Change-Id: I6fc998e78bee8119a339ff5f6a6c144200dd176e