[automerger skipped] Merge "Fix Telecom CTS crashes when checking for...

[automerger skipped] Merge "Fix Telecom CTS crashes when checking for emergency/voicemail number" into android15-tests-dev am: be9cebdb -s ours am: 5fdab135 -s ours

am skip reason: Merged-In I62a6b6d729849b79aef093eb3e2e3a16180c99c3 with SHA-1 373cca20 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3525570



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