[automerger skipped] Fix phone crash by multiple result messages am: 237e9e96 am: 2993c5e4 am: 18e74c61 am: 10dad7ed -s ours

am skip reason: Merged-In I981a4d60a8f025171bf99b0cb73d7097f82f56b6 with SHA-1 4f1bce5a is already in history

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

Change-Id: I023ab913016baa2920dc771a58356b0113a9680f