[automerger skipped] Fixed IWLAN handover issue am: 9a5c331d am: 367a2106...

[automerger skipped] Fixed IWLAN handover issue am: 9a5c331d am: 367a2106 am: c8445a73 -s ours

am skip reason: Merged-In I6fb3a7efb40669308641383f10658116a91b3697 with SHA-1 020402e6 is already in history

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

Change-Id: I7a7eab8a44a9e8ca8f444ef25f9981b5e9cccf63