Merge "Update getMergedSubscriberIds to pass subId"
am: f1aca7cf4e

Change-Id: I6560d494c1df2c2d3334db672ceefe23b4b5e4ac