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
Change-Id: Ie7ca62cef27ecf6f7ac6d99ffbd116265e0de1a2