[automerger skipped] Merge "[TelephonyMainline] Make...

[automerger skipped] Merge "[TelephonyMainline] Make getMergedSubscriberIdsFromGroup as System API and rename it" am: 7c8bda08 am: b11b8ec3 -s ours am: 1467af14 -s ours

am skip reason: Change-Id I6c077f3bee6bfd4d5b215aca4e9b19b719772b29 with SHA-1 e582f5bc is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1197840

Change-Id: I2f3f40b2e27ce9fe88538423f15cff01e7075ddb