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

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

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



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