getMergedSubscriberIds considers subId

This logic can be simplified a lot but for stability we will make the
smallest change, and follow up in another CL with simplification logic.

Bug: 131189269
Test: manually verified subscription group includes subId
Merged-In: Idf09e267ff3f4e27a2751f2b5220d7213bc09983
Change-Id: Idf09e267ff3f4e27a2751f2b5220d7213bc09983
(cherry picked from commit 5fd17a66c7758157731061a227410db986600a19)
1 file changed