Fixed that active sub ids are not sorted by slot index

Test: Unit tests
Bug: 119223420
Merged-In: Ife0f41762b471a0d22a9dab442a6d844ade1f093
Change-Id: Ife0f41762b471a0d22a9dab442a6d844ade1f093
(cherry picked from commit 6f1e11c1ab7211e0c55d9a5e6210f10075811949)
2 files changed