[automerger skipped] Fixed IWLAN handover issues am: 79d67fe7 am: 0628106c...

[automerger skipped] Fixed IWLAN handover issues am: 79d67fe7 am: 0628106c -s ours am: a664605a -s ours

am skip reason: Merged-In I96d5f7f7f8f39abcb8cdae98af0c92281a057163 with SHA-1 3f903c03 is already in history

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

Change-Id: If98ba8153be6b9c8d781447ce5556b38016faa63