Merge "Settings: Fix force close for telephony callback exceeding limitation"...

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

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



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