Merge "getMergedSubscriberIds considers subId"
am: 6c27754107

Change-Id: Ieab5ce7af0b5c1e64ab0bba74f958d0a6eebcc02