Merge "Added enhanced IWLAN handover check support" into tm-dev am: a61b748e am: 0447dc4e

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



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