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

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

Change-Id: I5f6cf81793b0add24ce8993ec5a0f21f30051f07