Merge "Added IWLAN handover rules support" am: 7aee3e22b4 am: 97ae1aaf7a

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

Change-Id: Iea2d458126aceb7d839c45044f2b0bad4c89ef3b