[automerger skipped] Merge "Update getMergedSubscriberIds to pass subId" am: f1aca7cf4e am: 3af50a6033 -s ours
am: 07a955d1ff -s ours
am skip reason: change_id I0d237b646969442b71597e66c9cb491c02a144d3 with SHA1 26dd1a5f4f is in history

Change-Id: I6262dcb39fdf8810efa6f15f76c203a239b573b1