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