[automerger skipped] Fix com.android.phone crash for wifionly project am: 0c506ba620 -s ours

am skip reason: Merged-In Ia49f219d992bb64174d63c04bec83b65367e514a with SHA-1 7f5c275249 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/19431629

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