[automerger skipped] Merge "Update getMergedSubscriberIds to pass subId" am: f1aca7cf
am: 3af50a60 -s ours
am skip reason: change_id I0d237b646969442b71597e66c9cb491c02a144d3 with SHA1 26dd1a5f is in history
Change-Id: I0d48e4003d58ab2f4a94c22745f45f1167418464