Merge "Fixed phone switcher crash" into sc-dev am: 814fbaf8

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

Change-Id: I88df6f824e488c53bcc735c6c7fc33d65d931154