[automerger skipped] Fixed crash in dump am: ba0b4639 am: 9fb23288 am:...

[automerger skipped] Fixed crash in dump am: ba0b4639 am: 9fb23288 am: 0d07d3b6 -s ours am: dbea166c -s ours am: 31b58588 -s ours

am skip reason: Merged-In I6cb09aa0e14018593cdb20837c46fe1bdb5c13ef with SHA-1 9818aeb6 is already in history

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

Change-Id: I2008f850ef82b568ec47b0b97e0ad093172580f8