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

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

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