Fix com.android.phone crash for wifionly project am: 7f5c275249 am: ace6838235 am: bdeb6f0516

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

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