[automerger skipped] Merge "Fixed phone switcher crash" am: 0c52bf1a am:...

[automerger skipped] Merge "Fixed phone switcher crash" am: 0c52bf1a am: 971d6b6d -s ours am: d7993439 -s ours

am skip reason: Merged-In If442489bc8dbb797be41c0913dae4970c5e3896e with SHA-1 98bc007b is already in history

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

Change-Id: Ia108fae4a8ac715a5a5475ca6cb947653dc68b06