[automerger skipped] Merge "Supported UNKNOWN in IWLAN handover rule" am:...

[automerger skipped] Merge "Supported UNKNOWN in IWLAN handover rule" am: 1a90569c am: 5a116635 am: bf5f0779 -s ours am: daed212c -s ours

am skip reason: Merged-In I68c23f970af2a554ab438f630363be4591664cbb with SHA-1 d9ac485b is already in history

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



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