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: dde5537f am: 0902d771

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



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