[automerger skipped] Merge "Added IWLAN handover support" am: 2cf2273c am:...

[automerger skipped] Merge "Added IWLAN handover support" am: 2cf2273c am: 705aff97 am: 42197799 -s ours am: a931eddd -s ours

am skip reason: Merged-In Idb6c8d1e64f857e616d6ad8b5a4e11873e62e787 with SHA-1 09f02ba0 is already in history

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

Change-Id: I92dac9a5c5d313910732a0d52c5b8224441869d9