[automerger skipped] Merge "Added enhanced IWLAN handover check support" am: 0f603e1f am: 73292c7d -s ours am: f57713a7 -s ours am: 12114742 -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: I642923d800d2e71b462626df4f95af924ffc6773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>