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: 12f8904d am: e660d8bf
Change-Id: If175382591432406323c39d83ff52db8bcc24e4d