[automerger skipped] Merge "[Telephony Mainline] Expose getActiveSubscriptionIdList" am: d7d92d6517 am: be214f5118 -s ours am: 58c061c395 -s ours
am skip reason: Change-Id Ic2886c8af0ef176cffcd674eb5b1a09cb49cc8f0 with SHA-1 5a07a245c9 is in history
Change-Id: Ic9be101484560635f65e5be35ac774fad5d71576
This commit is contained in: