Merge "Added enhanced IWLAN handover check support" am: 0f603e1ffb

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

Change-Id: I5f9319b03103ff90286a88c1fdc869189827c125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>