[automerger skipped] Merge "Added IWLAN handover support" am: 7c8bca86 am: 41a8e0c2 am: 939cf509 -s ours am: 4bdcb969 -s ours am: 774601b4 -s ours

am skip reason: Merged-In Iaf9cef37994ea8eb0e56c068dd39b9dee2d3ca90 with SHA-1 24e84528 is already in history

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

Change-Id: I6492216f8b8a74b8802654655678e38f06635d94