[automerger skipped] Merge "Added IWLAN handover rules support" am: 7aee3e22...

[automerger skipped] Merge "Added IWLAN handover rules support" am: 7aee3e22 am: 97ae1aaf am: d177e286 -s ours am: d24d8427 -s ours

am skip reason: Merged-In Ic5584908131d4c8e0940f3d60def2dc74a7405d9 with SHA-1 fd33d54f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2011998

Change-Id: I78cee58fcd56d65c2294fa3ac4b946b82a03cf80