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

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



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