[automerger skipped] IWLAN handover optimization am: 2b43a76e am: 4ac18992...

[automerger skipped] IWLAN handover optimization am: 2b43a76e am: 4ac18992 -s ours am: 6cd91887 -s ours am: b1de68bc -s ours

am skip reason: Merged-In Ic6ba2d662ca23b0c0f5b618ac7f04c546b49ff50 with SHA-1 7d0db95d is already in history

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



Change-Id: I8afe10b7dafa44e7bef5ef63b1e371f0fcff310b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>