[automerger skipped] Fixed crash in getPhoneNumber am: 52579347 am:...

[automerger skipped] Fixed crash in getPhoneNumber am: 52579347 am: cc423a76 -s ours am: 01c4d966 -s ours am: b076f22a -s ours am: 8d1d4146 -s ours

am skip reason: Merged-In Ifae48a1d358892797dd51b84baf923d1b4321dba with SHA-1 5e346bcb is already in history

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



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