[automerger skipped] Merge "Added enhanced IWLAN handover check support" am:...

[automerger skipped] Merge "Added enhanced IWLAN handover check support" am: 0f603e1f am: 73292c7d -s ours

am skip reason: Merged-In Iad41d4e8e23001b9c19a81edac04b1099e550f3e with SHA-1 72c2e830 is already in history

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



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