[automerger skipped] Merge changes from topic "iwlan_handover_rules" am:...

[automerger skipped] Merge changes from topic "iwlan_handover_rules" am: 822c7729 -s ours am: fc33df6b -s ours am: 8938c790 -s ours am: b223d90e -s ours

am skip reason: Merged-In Ia3106c8422eafa39b7ead632fabe1085f93e5cf4 with SHA-1 a01f473a is already in history

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

Change-Id: I0c135d58ae750b21b5e5008682379173d4739cd5