Merge changes from topics "GetActiveSubscriptionInfo", "getActiveSubInfoCount" am: 793d1f0e57

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2480955

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