[automerger skipped] Fixed IWLAN handover issues am: b4d5eaf6 am: d8a44ba0...

[automerger skipped] Fixed IWLAN handover issues am: b4d5eaf6 am: d8a44ba0 am: dacc0e0f -s ours am: 564bcae5 -s ours

am skip reason: Merged-In I74781e2765f340eb776f7e1f671ac7d17547bc64 with SHA-1 c2133e8d is already in history

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

Change-Id: I5f687f0a98e179aad6ada398da70d5b0f50db6fd