[automerger skipped] Replaced more places to use SubscriptionManagerService...

[automerger skipped] Replaced more places to use SubscriptionManagerService am: 0f1f740c am: 139dc557 am: fb8cbb4c -s ours

am skip reason: Merged-In Ifc72802f3f4b124b0aa18b166764a6cda8cc25e6 with SHA-1 1d11d80c is already in history

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



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