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

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



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