[automerger skipped] Merge "Fixed NPE in handover retry" am: f6f4840b am:...

[automerger skipped] Merge "Fixed NPE in handover retry" am: f6f4840b am: 19e2d2c7 am: cb7184bc -s ours am: 725957d1 -s ours am: 3cf48149 -s ours

am skip reason: Merged-In I27b1a69587799b922c819850efd71f18112a5106 with SHA-1 c4f9004b is already in history

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

Change-Id: Ied32471ca30c1f367798cb30982ca6e81504901e