[automerger skipped] Added GetActiveSubscriptionInfo support am: c4783e1b...

[automerger skipped] Added GetActiveSubscriptionInfo support am: c4783e1b am: e4a20641 am: 25a333a0 -s ours

am skip reason: Merged-In I8c0aa35d4430b7c6ca6d02c4e68a00b7d5ef9b94 with SHA-1 c79fdc91 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2473507



Change-Id: I6ae76a2db14323663c617052a8d8f49b1790e6e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>