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

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



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