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 am: 80f90d26
Change-Id: I19967c6c61877008dd7d9f249685f24d2ba73c8d