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: I3c9ca2896c4ce9266d5636d50493cc2a286471d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>