Merge changes from topic "ss-fix-limitedservice" into tm-dev am: 75bec304 am: 8988ef18

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



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