[automerger skipped] Merge changes from topics "GetActiveSubscriptionInfo",...

[automerger skipped] Merge changes from topics "GetActiveSubscriptionInfo", "getActiveSubInfoCount" am: 170a662a am: 0e653b8d am: 555a950d -s ours am: 0d9e44be -s ours am: 49ea1516 -s ours

am skip reason: Merged-In Iee6801573e4ad4ea08da7d725dd0c0292b7d96d2 with SHA-1 c61d2f7c is already in history

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



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