Merge "Merge "Remove slot ids from sSlotIndexToSubIds if they have the same...
Merge "Merge "Remove slot ids from sSlotIndexToSubIds if they have the same sub id" into rvc-dev am: f4b8e278 am: 12f8904d am: e660d8bf" into rvc-qpr-dev-plus-aosp am: 6abc1750
Change-Id: I1c9d3c803ac49b7535c1113cc09bcac3f6c28ffa