Merge "Added IWLAN handover support" am: 7c8bca867d am: 41a8e0c26b

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

Change-Id: I832d1be5db10bd55228ca5890b29129dee03f5c5