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