Merge "Settings: Fix force close for telephony callback exceeding limitation" into main am: 380a136e50

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2995004

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